lgy 2 days ago
parent
commit
193b525216
1 changed files with 2 additions and 2 deletions
  1. 2 2
      jcjyhr/app/zskk/model/Patient.php

+ 2 - 2
jcjyhr/app/zskk/model/Patient.php

@@ -209,7 +209,7 @@ class Patient extends ZskkModel
     public function getExam($patientCode,$where=[],$WHERE_REPORT=[],$EXAM_REPORT=[])
     {
         // 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)->where($WHERE_REPORT)->where($EXAM_REPORT)->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();
+        return (new ExamReport())->where('PATIENT_CODE',$patientCode)->where($where)->where($WHERE_REPORT)->where($EXAM_REPORT)->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','ACCESSION_NUM'])->select()->toArray();
     }
 
     public function getOrgName($id)
@@ -235,7 +235,7 @@ class Patient extends ZskkModel
 
     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'];
+        $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','e.ACCESSION_NUM'];
         $data = (new ExamReport())->alias('e')
             ->join('medical_information m','m.PATIENT_CODE = e.PATIENT_CODE')
             ->where('e.PATIENT_CODE',$patientCode)