lgy 1 week ago
parent
commit
0f75013271
1 changed files with 5 additions and 5 deletions
  1. 5 5
      jcjyhr/app/zskk/servies/CommonServies.php

+ 5 - 5
jcjyhr/app/zskk/servies/CommonServies.php

@@ -227,9 +227,11 @@ class CommonServies
             $STUDYUID = $data['STUDYUID'];
             $STUDYUID = $data['STUDYUID'];
             $ACCESSION_NUM = $data['ACCESSION_NUM'];
             $ACCESSION_NUM = $data['ACCESSION_NUM'];
             $STUDY_ID = '';
             $STUDY_ID = '';
+            $ORGNAME = $MEDICAL_INFORMATION['ORGNAME'];
+            $ORGCODE = $MEDICAL_INFORMATION['ORGCODE'];
             if(!empty($STUDYUID))
             if(!empty($STUDYUID))
             {
             {
-                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE STUDYUID='$STUDYUID'");
+                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE STUDYUID='$STUDYUID' AND INSTITUTION_ID='$ORGCODE'");
                 if(!empty($EXAMS))
                 if(!empty($EXAMS))
                 {
                 {
                     $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
                     $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
@@ -237,14 +239,14 @@ class CommonServies
             }
             }
             if(empty($STUDY_ID) && !empty($ACCESSION_NUM))
             if(empty($STUDY_ID) && !empty($ACCESSION_NUM))
             {
             {
-                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE ACCESSION_NUM='$ACCESSION_NUM'");
+                $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE ACCESSION_NUM='$ACCESSION_NUM' AND INSTITUTION_ID='$ORGCODE'");
                 if(!empty($EXAMS))
                 if(!empty($EXAMS))
                 {
                 {
                     $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
                     $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
                 }
                 }
                 if(empty($STUDY_ID))
                 if(empty($STUDY_ID))
                 {
                 {
-                    $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE PATIENT_NUM='$ACCESSION_NUM'");
+                    $EXAMS = Db::query("select STUDY_ID from PACS.EXAMS WHERE PATIENT_NUM='$ACCESSION_NUM' AND INSTITUTION_ID='$ORGCODE'");
                     if(!empty($EXAMS))
                     if(!empty($EXAMS))
                     {
                     {
                         $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
                         $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
@@ -255,8 +257,6 @@ class CommonServies
 //            $OBSERVATIONS_RESULT = $data['OBSERVATIONS_RESULT'];
 //            $OBSERVATIONS_RESULT = $data['OBSERVATIONS_RESULT'];
 //            $RESULT_STATUS_CODE = $data['RESULT_STATUS_CODE'];
 //            $RESULT_STATUS_CODE = $data['RESULT_STATUS_CODE'];
             $HR_ITEMNAME_CODE = $data['HR_ITEMNAME_CODE'];
             $HR_ITEMNAME_CODE = $data['HR_ITEMNAME_CODE'];
-            $ORGNAME = $MEDICAL_INFORMATION['ORGNAME'];
-            $ORGCODE = $MEDICAL_INFORMATION['ORGCODE'];
             $DEPTNAME = $MEDICAL_INFORMATION['DEPTNAME'];
             $DEPTNAME = $MEDICAL_INFORMATION['DEPTNAME'];
 //            $PRACTITIONERNAME = $data['PRACTITIONERNAME'];
 //            $PRACTITIONERNAME = $data['PRACTITIONERNAME'];
 //            $AUDITNAME = $data['AUDITNAME'];
 //            $AUDITNAME = $data['AUDITNAME'];