xg

jcjyhr/app/admin/controller/user/User.php

@@ -159,12 +159,12 @@ class User extends Backend
     public function resetPassword(): void
     {
         $id = $this->request->post('id', '');
-        $row = Admin::where('id',$id)->find();
+        $row = Admin::where('ID',$id)->find();
         if(empty($row))
         {
             $this->error('参数错误,人员无法找到');
         }
-        $password = $row['username'].'@Zskk2024';
+        $password = $row['USERNAME'].'@Zskk2024';
         $this->model->resetPassword($id, $password);
         $this->success('重置成功，初始密码为'.$password);
     }
@@ -178,13 +178,13 @@ class User extends Backend
             $this->error('参数错误,人员无法找到');
         }
         $oldPass =  $this->request->post('oldPassword', '');
-        if(encrypt_password($oldPass,$row['salt']) != $row['password'])
+        if(encrypt_password($oldPass,$row['SALT']) != $row['PASSWORD'])
         {
             $this->error('旧密码输入错误');
         }
         $newPass =  $this->request->post('newPassword', '');
         $check = $this->checkPass($newPass);
-        if($newPass == $row['username'].'@Zskk2024')
+        if($newPass == $row['USERNAME'].'@Zskk2024')
         {
             $this->error('新密码不能与初始密码一致');
         }
@@ -199,7 +199,7 @@ class User extends Backend
         }
         $salt   = Random::build('alnum', 16);
         $passwd = encrypt_password($newPass, $salt);
-        $oldPassArr = $this->makeOldPassArr($row['oldPassword'],$passwd,$salt);
+        $oldPassArr = $this->makeOldPassArr($row['OLDPASSWORD'],$passwd,$salt);
         if(!$oldPassArr)
         {
             $this->error('您在最近的5次修改密码中使用过改密码，请更换新的密码进行修改');
@@ -240,8 +240,8 @@ class User extends Backend
         $id = $this->request->post('id', '');
         $pass = $this->request->post('pass', '');
         $row = Admin::where('id',$id)->find();
-        $passwd = encrypt_password($pass, $row['salt']);
-        if($row['password'] !== $passwd)
+        $passwd = encrypt_password($pass, $row['SALT']);
+        if($row['PASSWORD'] !== $passwd)
         {
             $this->error('密码错误');
         }

jcjyhr/app/zskk/controller/Api.php

@@ -8,6 +8,7 @@ use app\common\library\Gm;
 use app\zskk\servies\EmpowerServies;
 use app\zskk\servies\HrServies;
 use app\zskk\servies\PatientServies;
+use think\facade\Db;
 use think\facade\Config;
 
 class Api extends ApiController
@@ -217,8 +218,9 @@ class Api extends ApiController
      */
     public function getRecogData(HrServies $servies,PatientServies $patientServies): void
     {
+        set_time_limit(0);
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         if(empty($params))
         {
             $this->error('密文解析失败');
@@ -279,6 +281,13 @@ class Api extends ApiController
         $this->success('success', $arr);
     }
 
+    public function getExamData(PatientServies $patientServies)
+    {
+        $params = $this->request->post();
+        $arr = $patientServies->getExamData($params);
+        $this->success('success', $arr);
+    }
+
     public function getPatientLab(PatientServies $patientServies)
     {
         $params = $this->request->post();
@@ -305,4 +314,12 @@ class Api extends ApiController
         $url = '/getPatientCheck?data='.$data;
         $this->success('success', $url);
     }
+
+    public function testApi()
+    {
+        $STUDYUID = '82562722.16043349';
+        $a = Db::query("select STUDY_ID from PACS.EXAMS WHERE STUDYUID='$STUDYUID'");
+
+        var_dump($a[0]);
+    }
 }

jcjyhr/app/zskk/model/Patient.php

@@ -199,7 +199,7 @@ class Patient extends ZskkModel
     public function getExam($patientCode,$where=[])
     {
         // return (new ExamReport())->where('PATIENT_CODE',$patientCode)->field(['NAME','SERIESNUM', 'EXAM_REQUESTID', 'REPORTID', 'EXAM_ITEMNAME', 'BODYSITE_CATEG', 'BODYSITE_CATEG_CODE', 'BODYSITE', 'OBSERVATIONS_COMMENT', 'OBSERVATIONS_RESULT', 'BODYSITE_CATEG_CODE', 'BODYSITE', 'OBSERVATIONS_COMMENT', 'OBSERVATIONS_RESULT', 'IMAGES', 'DICOM_INDEXID', 'DICOM_INDEXID', 'OBSERVATIONS_COMMENT', 'OBSERVATIONS_RESULT', 'IMAGES', 'DICOM_INDEXID', 'EXAM_ITEMNAME','EXAM_APPLICATION_CODE','STUDYTIME','EXAM_ITEMNAME_CODE','EXAM_REPORT_CODE','PRACTITIONERNAME'])->select()->toArray();
-        return (new ExamReport())->where('PATIENT_CODE',$patientCode)->where($where)->field(['SERIESNUM','REQUESTID','REPORTID','DEVICETYPE_CODE','EXAM_ITEMNAME','EXAM_ITEMNAME_CODE','BODYSITE','OBSERVATIONS_COMMENT','OBSERVATIONS_RESULT','RESULT_STATUS_CODE', 'RESULT_STATUS', 'HR_RANGE','HR_ITEMNAME_CODE', 'HR_ITEMNAME','IMAGES','STUDY_ID', 'ORGNAME','ORGCODE','DEPTNAME','PRACTITIONERNAME','AUDITNAME','REPORTTIME','STUDYTIME','REPORT'])->select()->toArray();
+        return (new ExamReport())->where('PATIENT_CODE',$patientCode)->where($where)->field(['PATIENT_CODE','SERIESNUM','REQUESTID','REPORTID','DEVICETYPE_CODE','EXAM_ITEMNAME','EXAM_ITEMNAME_CODE','BODYSITE','OBSERVATIONS_COMMENT','OBSERVATIONS_RESULT','RESULT_STATUS_CODE', 'RESULT_STATUS', 'HR_RANGE','HR_ITEMNAME_CODE', 'HR_ITEMNAME','IMAGES','STUDY_ID', 'ORGNAME','ORGCODE','DEPTNAME','PRACTITIONERNAME','AUDITNAME','REPORTTIME','STUDYTIME','REPORT'])->select()->toArray();
     }
 
     public function saveReportStudy($studyUid,$studyId)
@@ -218,16 +218,35 @@ class Patient extends ZskkModel
         return (new InspectReport())->where('PATIENT_CODE',$patientCode)->where($where)->field(['SERIESNUM','REPORTID','LAB_ITEMNAME','LAB_ITEMNAME_TYPE_CODE','PRACTITIONERNAME','AUDITNAME','ORGNAME','ORGCODE','DEPTNAME','REPORT_COMMENT','REPORTTIME','REPORT','LAB_HR_ITEMNAME_CODE', 'LAB_HR_ITEMNAME', 'HR_RANGE','SPECIMEN_TYPE','INSPECT_REPORT_CODE','RECOG_STATUS'])->select()->toArray();
     }
 
+    public function getExamData($patientCode)
+    {
+        $field = ['m.AGE','m.GENDER','m.DIAGNOSENAME','e.NAME','e.SERIESNUM','e.REQUESTID','e.REPORTID','e.DEVICETYPE_CODE','e.EXAM_ITEMNAME','e.EXAM_ITEMNAME_CODE','e.BODYSITE','e.OBSERVATIONS_COMMENT','e.OBSERVATIONS_RESULT','e.RESULT_STATUS_CODE', 'RESULT_STATUS', 'HR_RANGE','e.HR_ITEMNAME_CODE', 'HR_ITEMNAME','e.IMAGES','e.STUDY_ID', 'e.ORGNAME','e.ORGCODE','e.DEPTNAME','e.PRACTITIONERNAME','e.AUDITNAME','e.REPORTTIME','e.STUDYTIME','e.REPORT'];
+        $data = (new ExamReport())->alias('e')
+            ->join('medical_information m','m.PATIENT_CODE = e.PATIENT_CODE')
+            ->where('e.PATIENT_CODE',$patientCode)
+            ->field($field)
+            ->find();
+        return $data;
+    }
+
     public function getInspectData($where,$field)
     {
         return (new InspectReport())->where($where)->field($field)->find();
     }
     public function getLab($reportCode)
     {
-        // return (new LabData())->where('INSPECT_REPORT_CODE',$reportCode)->field(['EXAM_REQUESTID','REPORTID', 'ORGCODE', 'LAB_ITEMDETAILNAME', 'LAB_ITEMDETAILNAME_CODE', 'LAB_ITEMDETAILNAME_NUMBER', 'LAB_ITEMDETAILVALUE', 'LAB_ITEMDETAILSPEC', 'LAB_ITEMDETAILINTERPRETATION', 'LAB_ITEMDETAILRANGE', 'CRITICAL_RANGE', 'LAB_HR_ITEMDETAIL_STATUS', 'LAB_HR_ITEMDETAILNAME', 'LAB_HR_ITEMDETAILNAME_CODE'])->select()->toArray();
         return (new LabData())->where('INSPECT_REPORT_CODE',$reportCode)->field(['LAB_ITEMDETAILNAME','LAB_ITEMDETAILNAME_EN','LAB_ITEMDETAILNAME_NUMBER','LAB_ITEMDETAILVALUE','LAB_ITEMDETAILSPEC','LAB_ITEMDETAILINTERPRETATION','LAB_ITEMDETAILINTERPRETATION_BIA','LAB_ITEMDETAILRANGE','CRITICAL_RANGE','LAB_METHOD','KB','MIC','LAB_ITEMDETAILINTERPRE','LAB_HR_ITEMDETAILNAME_CODE','LAB_HR_ITEMDETAILNAME','HR_RANGE','RECOG_STATUS','LAB_ITEMDETAILNAME_CODE'])->order('LAB_ITEMDETAILNAME_NUMBER')->select()->toArray();
     }
 
+    public function getInspectReport($inspectCode)
+    {
+        return (new InspectReport())->alias('i')
+            ->join(['medical_information'=>'m'],'m.PATIENT_CODE=i.PATIENT_CODE')
+            ->where('i.INSPECT_REPORT_CODE',$inspectCode)
+            ->field('m.NAME,m.GENDER,m.CLASS,i.SERIESNUM,ENCOUNTER_CARD_NO,RECORD_CODE,ENCOUNTER_DATE,i.DEPTNAME,CHIEFCOMPLAINT,i.ORGNAME,m.AGE,DIAGNOSENAME,m.DOCTORNAME,SPECIMEN_TYPE,PRACTITIONERNAME,AUDITNAME,REPORTTIME,LAB_ITEMNAME,REPORT,HR_RANGE,LAB_HR_ITEMNAME')
+            ->find();
+    }
+
     public function updateMiddleStatus($id,$update):void
     {
         (new MiddleStorage())->where('id',$id)->update($update);

jcjyhr/app/zskk/servies/CommonServies.php

@@ -8,6 +8,7 @@ use app\common\library\Handle;
 use app\zskk\model\CallRecord;
 use app\zskk\model\Patient;
 use think\facade\Config;
+use think\facade\Db;
 
 class CommonServies
 {
@@ -221,10 +222,29 @@ class CommonServies
             $EXAM_ITEMNAME = $data['EXAM_ITEMNAME'];
             $EXAM_ITEMNAME_CODE = $data['EXAM_ITEMNAME_CODE'];
             $BODYSITE = $data['BODYSITE'];
+            $STUDYUID = $data['STUDYUID'];
+            $ACCESSION_NUM = $data['ACCESSION_NUM'];
+            $STUDY_ID = '';
+            if(!empty($STUDYUID))
+            {
+                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE STUDYUID='$STUDYUID'");
+                if(!empty($EXAMS))
+                {
+                    $STUDY_ID = $EXAMS[0]['STUDY_ID'];
+                }
+            }
+            if(!empty($STUDY_ID) && !empty($ACCESSION_NUM))
+            {
+                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE ACCESSION_NUM='$ACCESSION_NUM'");
+                if(!empty($EXAMS))
+                {
+                    $STUDY_ID = $EXAMS[0]['STUDY_ID'];
+                }
+            }
 //            $OBSERVATIONS_COMMENT = $data['OBSERVATIONS_COMMENT'];
 //            $OBSERVATIONS_RESULT = $data['OBSERVATIONS_RESULT'];
 //            $RESULT_STATUS_CODE = $data['RESULT_STATUS_CODE'];
-//            $HR_RANGE = $data['HR_RANGE'];
+            $HR_RANGE = '阳泉-HR';
             $HR_ITEMNAME_CODE = $data['HR_ITEMNAME_CODE'];
             $ORGNAME = $MEDICAL_INFORMATION['ORGNAME'];
             $ORGCODE = $MEDICAL_INFORMATION['ORGCODE'];
@@ -271,7 +291,7 @@ class CommonServies
 //                'OBSERVATIONS_COMMENT' => $OBSERVATIONS_COMMENT,
 //                'OBSERVATIONS_RESULT' => $OBSERVATIONS_RESULT,
 //                'RESULT_STATUS_CODE' => $RESULT_STATUS_CODE,
-//                'HR_RANGE' => $HR_RANGE,
+                'HR_RANGE' => $HR_RANGE,
                 'HR_ITEMNAME_CODE' => $HR_ITEMNAME_CODE,
                 'ORGNAME' => $ORGNAME,
                 'ORGCODE' => $ORGCODE,
@@ -291,7 +311,10 @@ class CommonServies
                 'CALL_FLAG' => $MEDICAL_INFORMATION['CALL_FLAG'],
                 'RECOG_STATUS' => $RECOG_STATUS,
                 // todo 
-                'create_time' => date('Y-m-d H:i:s')
+                'create_time' => date('Y-m-d H:i:s'),
+                'STUDYUID' => $STUDYUID,
+                'ACCESSION_NUM' => $ACCESSION_NUM,
+                'STUDY_ID'=>$STUDY_ID
 
             
             ];        
@@ -379,7 +402,7 @@ class CommonServies
                 }
             }
             $itemType = $itemLabDict['ITEMTYPE'] ?? '';
-//            $HR_RANGE = $data['HR_RANGE'];
+            $HR_RANGE = '阳泉-HR';
             // $SPECIMEN_TYPE = $this->getSPECIMEN_TYPEByCode($SPECIMEN_TYPE_CODE);
             $LAB_ITEMNAME_TYPE = $this->getLAB_ITEMNAME_TYPEByCode($LAB_ITEMNAME_TYPE_CODE);
             $INSPECT_REPORT_CODE = $this->getINSPECT_REPORT_CODE($PATIENT_CODE, $REPORTID);
@@ -411,7 +434,7 @@ class CommonServies
                 'REPORT' => $REPORT,
                 'LAB_HR_ITEMNAME_CODE' => $LAB_HR_ITEMNAME_CODE,
                 'ITEMTYPE'=>$itemType,
-//                'HR_RANGE' => $HR_RANGE,
+                'HR_RANGE' => $HR_RANGE,
                 'LAB_HR_ITEMNAME' => $LAB_HR_ITEMNAME,
                 'SPECIMEN_TYPE' => $SPECIMEN_TYPE,
                 'INSPECT_REPORT_CODE' => $INSPECT_REPORT_CODE,

jcjyhr/app/zskk/servies/PatientServies.php

@@ -1416,6 +1416,12 @@ class PatientServies
         return $list;
     }
 
+    public function getExamData($params)
+    {
+        $arr = $this->patientModel->getExamData($params['patient_code']);
+        return $arr;
+    }
+
     public function getPatientLab($params)
     {
         $idCard = Gm::encrypt(Config::get('gm.key'),$params['id_card']);
@@ -1450,8 +1456,10 @@ class PatientServies
 
     public function getLabData($params)
     {
+        $inspect = $this->patientModel->getInspectReport($params['INSPECT_REPORT_CODE']);
         $lab = $this->patientModel->getLab($params['INSPECT_REPORT_CODE']);
-        return $lab;
+        $inspect['child'] = $lab;
+        return $inspect;
     }
 
 }