xg

jcjyhr/app/zskk/servies/PatientServies.php

@@ -1518,19 +1518,25 @@ class PatientServies
 //                continue;
             }
             $medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
+            $patientData = [];
             foreach ($exam as $value)
             {
+                $arr = [];
                 if(!empty($value))
                 {
-                    $value['AGE'] = $medical['AGE'];
-                    $value['GENDER'] = $medical['GENDER'];
-                    $value['PHONE'] = $v['PHONE'];
-                    $value['NAME'] = $v['NAME'];
+                    if(!empty($patientData))
+                    {
+                        $arr['AGE'] = $medical['AGE'];
+                        $arr['GENDER'] = $medical['GENDER'];
+                        $arr['PHONE'] = $v['PHONE'];
+                        $arr['NAME'] = $v['NAME'];
+                        $patientData = $arr;
+                    }
                     $list[] = $value;
                 }
             }
         }
-        return $list;
+        return ['list'=>$list,'patient'=>$patientData];
     }
 
     public function getExamData($params)
@@ -1551,6 +1557,7 @@ class PatientServies
         }
         $patient = $this->patientModel->getPatientsByID_CARDNUM($idCard,$where);
         $list = [];
+        $patientData = [];
         foreach ($patient as $v)
         {
             $arr = [];
@@ -1560,16 +1567,20 @@ class PatientServies
             {
                 if(!empty($value))
                 {
-                    $value['AGE'] = $medical['AGE'];
-                    $value['GENDER'] = $medical['GENDER'];
-                    $value['PHONE'] = $v['PHONE'];
-                    $value['NAME'] = $v['NAME'];
+                    if(!empty($patientData))
+                    {
+                        $arr['AGE'] = $medical['AGE'];
+                        $arr['GENDER'] = $medical['GENDER'];
+                        $arr['PHONE'] = $v['PHONE'];
+                        $arr['NAME'] = $v['NAME'];
+                        $patientData = $arr;
+                    }
                     $list[] = $value;
                 }
                 $list[] = $value;
             }
         }
-        return $list;
+        return ['list'=>$list,'patient'=>$patientData];
     }
 
     public function getLabData($params)