|
@@ -1513,6 +1513,7 @@ class PatientServies
|
|
$patientData = [];
|
|
$patientData = [];
|
|
foreach ($patient as $v)
|
|
foreach ($patient as $v)
|
|
{
|
|
{
|
|
|
|
+ $medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
|
|
if(empty($patientData))
|
|
if(empty($patientData))
|
|
{
|
|
{
|
|
$arr['AGE'] = $medical['AGE'];
|
|
$arr['AGE'] = $medical['AGE'];
|
|
@@ -1526,7 +1527,6 @@ class PatientServies
|
|
{
|
|
{
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- $medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
|
|
|
|
foreach ($exam as $value)
|
|
foreach ($exam as $value)
|
|
{
|
|
{
|
|
$arr = [];
|
|
$arr = [];
|
|
@@ -1563,18 +1563,18 @@ class PatientServies
|
|
$arr = [];
|
|
$arr = [];
|
|
$lab = $this->patientModel->getInspect($v['PATIENT_CODE']);
|
|
$lab = $this->patientModel->getInspect($v['PATIENT_CODE']);
|
|
$medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
|
|
$medical = $this->patientModel->getMedical($v['PATIENT_CODE']);
|
|
|
|
+ if(empty($patientData))
|
|
|
|
+ {
|
|
|
|
+ $arr['AGE'] = $medical['AGE'];
|
|
|
|
+ $arr['GENDER'] = $medical['GENDER'];
|
|
|
|
+ $arr['PHONE'] = $v['PHONE'];
|
|
|
|
+ $arr['NAME'] = $v['NAME'];
|
|
|
|
+ $patientData = $arr;
|
|
|
|
+ }
|
|
foreach ($lab as $value)
|
|
foreach ($lab as $value)
|
|
{
|
|
{
|
|
if(!empty($value))
|
|
if(!empty($value))
|
|
{
|
|
{
|
|
- 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;
|
|
}
|
|
}
|
|
$list[] = $value;
|
|
$list[] = $value;
|