lgy 2 روز پیش
والد
کامیت
997cc57f07
2فایلهای تغییر یافته به همراه5 افزوده شده و 8 حذف شده
  1. 2 2
      jcjyhr/app/zskk/controller/Patient.php
  2. 3 6
      jcjyhr/app/zskk/servies/PatientServies.php

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

@@ -117,11 +117,11 @@ class Patient extends ZskkApiController
             $params = $servies->makeMappingData($params,'0','postExamReport');
             $data = $servies->postExamReport($params);
             $data = $this->makeEncryptData($data);
-            $this->success($data,'');
         }catch (\Exception $e)
         {
             $this->error($e->getMessage());
         }
+        $this->success('success',$data);
     }
 
     /**
@@ -135,10 +135,10 @@ class Patient extends ZskkApiController
             $params = $servies->makeMappingData($params,'0','postLabReport');
             $data = $servies->postLabReport($params);
             $data = $this->makeEncryptData($data);
-            $this->success($data,'');
         }catch (\Exception $e)
         {
             $this->error($e->getMessage());
         }
+        $this->success('success',$data);
     }
 }

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

@@ -900,7 +900,7 @@ class PatientServies
     /*
      * 上传检查数据
      */
-    public function postExamInfo($params): array
+    public function postExamInfo($params): string
     {
         // try {
             $check = $this->checkPostExamReport($params);
@@ -917,9 +917,9 @@ class PatientServies
             $MEDICAL_INFORMATION_INSERT['create_time'] =  $check['EXAM_REPORTS'][0]['create_time'];
             $this->patientModel->saveMedical($MEDICAL_INFORMATION_INSERT);
             $EXAM_REPORTS = $check['EXAM_REPORTS'];
-            $EXAM_REPORT_CODE = $this->saveExamData($EXAM_REPORTS);
+            $this->saveExamData($EXAM_REPORTS);
             $this->saveUploadHospitalPatient($MEDICAL_INFORMATION['PATIENT_CODE']);
-            return ['code'=>$EXAM_REPORT_CODE];
+            return 'success';
         // }catch (\Exception $e)
         // {
         //     return $e->getMessage();
@@ -946,10 +946,8 @@ class PatientServies
     {
 
         $EXAM_REPORTS_INSERT = [];
-        $CODE = '';
         foreach ($EXAM_REPORTS as $k=>$v)
         {
-            $CODE = $v['EXAM_REPORT_CODE'];
             $report = $this->patientModel->getExamReport(['EXAM_REPORT_CODE'=>$v['EXAM_REPORT_CODE']],'*');
             if(!empty($report))
             {
@@ -959,7 +957,6 @@ class PatientServies
             $EXAM_REPORTS_INSERT[] = $v;
         }
         $this->patientModel->saveExamReport($EXAM_REPORTS_INSERT);
-        return $CODE;
     }
 
     public function makeUrl($base64_string)