Merge branch 'master' of http://code.pacsonline.cn/zskk_bg/guochanhua

jcjyhr/app/zskk/servies/CommonServies.php

@@ -227,9 +227,11 @@ class CommonServies
             $STUDYUID = $data['STUDYUID'];
             $ACCESSION_NUM = $data['ACCESSION_NUM'];
             $STUDY_ID = '';
+            $ORGNAME = $MEDICAL_INFORMATION['ORGNAME'];
+            $ORGCODE = $MEDICAL_INFORMATION['ORGCODE'];
             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))
                 {
                     $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
@@ -237,14 +239,14 @@ class CommonServies
             }
             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))
                 {
                     $STUDY_ID = $EXAMS[0]['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))
                     {
                         $STUDY_ID = $EXAMS[0]['STUDY_ID'] ?? '';
@@ -255,8 +257,6 @@ class CommonServies
 //            $OBSERVATIONS_RESULT = $data['OBSERVATIONS_RESULT'];
 //            $RESULT_STATUS_CODE = $data['RESULT_STATUS_CODE'];
             $HR_ITEMNAME_CODE = $data['HR_ITEMNAME_CODE'];
-            $ORGNAME = $MEDICAL_INFORMATION['ORGNAME'];
-            $ORGCODE = $MEDICAL_INFORMATION['ORGCODE'];
             $DEPTNAME = $MEDICAL_INFORMATION['DEPTNAME'];
 //            $PRACTITIONERNAME = $data['PRACTITIONERNAME'];
 //            $AUDITNAME = $data['AUDITNAME'];

jcjyhr/app/zskk/servies/PatientServies.php

@@ -1601,7 +1601,7 @@ class PatientServies
             {
                 $arr['AGE'] = $medical['AGE'];
                 $arr['GENDER'] = $medical['GENDER'];
-                $arr['PHONE'] = $v['PHONE'];
+                $arr['PHONE'] = empty($v['PHONE']) ? '' : substr_replace($v['PHONE'],'****',3,4);
                 $arr['NAME'] = $v['NAME'];
                 $patientData = $arr;
             }

jcjyhr/extend/ba/Auth.php

@@ -192,8 +192,8 @@ class Auth
             ->select()
             ->toArray();
         foreach ($rules as $key => $rule) {
-            if (!empty($rule['keepalive'])) {
-                $rules[$key]['keepalive'] = $rule['name'];
+            if (!empty($rule['KEEPALIVE'])) {
+                $rules[$key]['KEEPALIVE'] = $rule['NAME'];
             }
         }