|
@@ -1512,7 +1512,11 @@ class PatientServies
|
|
|
$list = [];
|
|
|
foreach ($patient as $v)
|
|
|
{
|
|
|
- $exam = $this->patientModel->getExam($v['PATIENT_CODE']);
|
|
|
+ $exam = $this->patientModel->getExam($v['PATIENT_CODE'],['study_id','!=','']);
|
|
|
+ if(empty($exam))
|
|
|
+ {
|
|
|
+// continue;
|
|
|
+ }
|
|
|
$medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
|
|
|
foreach ($exam as $value)
|
|
|
{
|
|
@@ -1521,6 +1525,7 @@ class PatientServies
|
|
|
$value['AGE'] = $medical['AGE'];
|
|
|
$value['GENDER'] = $medical['GENDER'];
|
|
|
$value['PHONE'] = $v['PHONE'];
|
|
|
+ $value['NAME'] = $v['NAME'];
|
|
|
$list[] = $value;
|
|
|
}
|
|
|
}
|