lgy 3 weeks ago
parent
commit
af989ca712

+ 4 - 4
jcjyhr/app/zskk/servies/HrServies.php

@@ -101,8 +101,8 @@ class HrServies
         $inspect_report = [];
         if($params['HR_ITEM_CODE'] ?? '')
         {
-//            $exam_report[] = ['HR_ITEMNAME_CODE','in',explode(';',$params['HR_ITEM_CODE'])];
-//            $inspect_report[] = ['LAB_HR_ITEMNAME_CODE','in',explode(';',$params['HR_ITEM_CODE'])];
+            $exam_report[] = ['HR_ITEMNAME_CODE','in',array_filter(explode(';',$params['HR_ITEM_CODE']))];
+            $inspect_report[] = ['LAB_HR_ITEMNAME_CODE','in',array_filter(explode(';',$params['HR_ITEM_CODE']))];
         }
         $_data = $this->getRecogViewDetail($ID_CARDNUM,$params['ORGCODE'] ?? '', $WHERE,$exam_report,$inspect_report,$hr);
         $patient = $_data[0]['PATIENT'] ?? [];
@@ -137,10 +137,10 @@ class HrServies
         $this->callRecordModel->save($data);
     }
 
-    public function getRecogViewDetail($ID_CARDNUM, $HRORGCODE,$WHERE,$INSPECT_REPORT,$EXAM_REPORT,$hr): array {
+    public function getRecogViewDetail($ID_CARDNUM, $HRORGCODE,$WHERE,$EXAM_REPORT,$INSPECT_REPORT,$hr): array {
         $datas = array();
         $patients = $this->patientModel->getPatientsByID_CARDNUM($ID_CARDNUM);
-       
+
         foreach($patients as $patient) {
             $data = $this->getRecogViewDetailByPATIENT_CODE($patient['PATIENT_CODE'], $HRORGCODE,$hr,$WHERE,$INSPECT_REPORT,$EXAM_REPORT);
             if(empty($data))

+ 2 - 3
jcjyhr/app/zskk/servies/PatientServies.php

@@ -785,7 +785,7 @@ class PatientServies
             return [];
         }
         $patient = $patient->toArray();
-        $medical = $this->patientModel->getMedical($patient['PATIENT_CODE'],$medicalWhere);
+        $medical = $this->patientModel->getMedical($patient['PATIENT_CODE']);
         if(empty($medical))
         {
             return [];
@@ -1522,8 +1522,7 @@ class PatientServies
                 $arr['NAME'] = $v['NAME'];
                 $patientData = $arr;
             }
-//            $exam = $this->patientModel->getExam($v['PATIENT_CODE'],"STUDY_ID != ''");
-            $exam = $this->patientModel->getExam($v['PATIENT_CODE']);
+            $exam = $this->patientModel->getExam($v['PATIENT_CODE'],"STUDY_ID != ''");
             if(empty($exam))
             {
                 continue;