|
@@ -30,7 +30,7 @@ class ApplicationModel extends ZskkDefaultModel {
|
|
|
|
|
|
|
|
|
public function getTemplateInfo($patientId,$institution){
|
|
|
- $patient = ExamModel::where('patient_id',$patientId)->field('patient_num AS pnum,name AS pname,SEX AS sex,age')->find();
|
|
|
+ $patient = ExamModel::where('patient_id',$patientId)->field('patient_num AS pnum,name AS pname,SEX AS sex,AGE AS age')->find();
|
|
|
$institutionInfo = InstitutionModel::where('id',$institution)->field('name AS institution_name')->find();
|
|
|
$info = array_merge((json_decode(json_encode($patient),true)) ?? [],(json_decode(json_encode($institutionInfo),true)) ?? []);
|
|
|
return $info;
|