lgy 1 dia atrás
pai
commit
85cf77da9f

+ 3 - 3
server/application/api/model/api/ApiModel.php

@@ -18,13 +18,13 @@ class ApiModel extends ZskkDefaultModel {
             $field = [
                 'a.name', 'a.sex', 'a.age',
                 'a.exam_id', 'a.patient_num', 'a.exam_class', 'a.exam_datetime', 'a.study_id',  'a.accession_num', 'a.exam_project','a.remote_institution_name',
-                'r.report_result', 'r.report_datetime','r.id as rid',
+                'r.report_result', 'r.report_datetime','r.id AS rid',
                 'r.report_doctor_name',
                 'r.review_doctor_name',
                 'a.report_status',
                 'r.remote_application_id',
-                'a.id as ra_id',
-                'ro.status','ro.id as order_id'
+                'a.id AS ra_id',
+                'ro.status','ro.id AS order_id'
             ];
             $list = ApplicationModel::alias('a')
                 ->join(['remote_order'=>'ro'],'a.id=ro.application_id','left')

+ 2 - 2
server/application/api/model/application/ApplicationModel.php

@@ -30,8 +30,8 @@ class ApplicationModel extends ZskkDefaultModel {
 
 
     public function getTemplateInfo($patientId,$institution){
-        $patient = ExamModel::where('patient_id',$patientId)->field('patient_num as pnum,name as pname,sex,age')->find();
-        $institutionInfo = InstitutionModel::where('id',$institution)->field('name as institution_name')->find();
+        $patient = ExamModel::where('patient_id',$patientId)->field('patient_num AS pnum,name AS pname,sex,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;
     }

+ 3 - 3
server/application/api/model/dict/DictModel.php

@@ -58,7 +58,7 @@ class DictModel extends ZskkDefaultModel {
     {
         $data = ConstantModel::where('parent_id','illness')
             ->cache('illness',43200)
-            ->field('constant_value as name')
+            ->field('constant_value AS name')
             ->select();
         return $data;
     }
@@ -67,7 +67,7 @@ class DictModel extends ZskkDefaultModel {
     {
         $data = ConstantModel::where('parent_id','family_ill')
             ->cache('family_ill',43200)
-            ->field('constant_value as name')
+            ->field('constant_value AS name')
             ->select();
         return $data;
     }
@@ -107,7 +107,7 @@ class DictModel extends ZskkDefaultModel {
     {
         $data = ConstantModel::where('parent_id','exam_class')
             ->cache('exam_class',43200)
-            ->field('constant_value as name')
+            ->field('constant_value AS name')
             ->select();
         return $data;
     }

+ 19 - 19
server/application/api/model/exam/ExamModel.php

@@ -41,8 +41,8 @@ class ExamModel extends ZskkDefaultModel {
                 unset($moreWhere[0]);
             }
             $field = [
-                'e.name', 'e.sex', 'e.age','e.institution_id','e.study_id','e.id as exam_id',
-                'e.id as exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime',  'e.exam_status', 'e.accession_num', 'e.exam_project','e.accession_num',
+                'e.name', 'e.sex', 'e.age','e.institution_id','e.study_id','e.id AS exam_id',
+                'e.id AS exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime',  'e.exam_status', 'e.accession_num', 'e.exam_project','e.accession_num',
                 're.clin_doctors_name','re.register_name'
             ];
 
@@ -131,8 +131,8 @@ class ExamModel extends ZskkDefaultModel {
         // 获取详情数据
         $field = [
             'e.patient_num','r.exam_sub_class','e.exam_project','r.illness_desc','r.phys_sign','e.exam_datetime','e.bed_no','e.hopitalized_no','e.patient_area','e.application_department','e.application_doctor','e.id','e.exam_class',
-            'e.clin_symp','e.clin_diag','r.anamnesis','r.family_ill','r.ext as remark','r.device_name','e.out_patient',
-            'e.name','p.card_type','e.card_num','e.sex','e.age','e.birthday','e.phone','e.institution_id',"'' as institution",
+            'e.clin_symp','e.clin_diag','r.anamnesis','r.family_ill','r.ext AS remark','r.device_name','e.out_patient',
+            'e.name','p.card_type','e.card_num','e.sex','e.age','e.birthday','e.phone','e.institution_id',"'' AS institution",
             'e.his_patient_id','e.body_part_text'
         ];
         $data = $this
@@ -202,7 +202,7 @@ class ExamModel extends ZskkDefaultModel {
             }
             $field = [
                 'e.name', 'e.sex', 'e.age','e.patient_id AS pid','e.hopitalized_no','e.bed_no','e.patient_area','e.body_part','e.application_department','e.application_doctor','e.out_patient','e.delivery_doctor','e.his_patient_id',
-                'e.id AS exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', "e.study_id",/*"CONCAT(study_id,'&node_type=',node_type) as study_id",*/ 'e.exam_status', 'e.accession_num', 'e.exam_project','e.medical_code','e.body_part_code','e.device_code','e.exam_datetime_code',
+                'e.id AS exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', "e.study_id",/*"CONCAT(study_id,'&node_type=',node_type) AS study_id",*/ 'e.exam_status', 'e.accession_num', 'e.exam_project','e.medical_code','e.body_part_code','e.device_code','e.exam_datetime_code',
                 'r.report_result', 'r.report_datetime','r.id AS rid','e.doctor_sign','e.patient_source','e.node_type',
                 'r.report_doctor_name','r.report_datetime',
                 'r.review_doctor_name','r.review_datetime',
@@ -270,7 +270,7 @@ class ExamModel extends ZskkDefaultModel {
                 ->select();
             if($institutionId == '73000003')
             {
-                foreach ($list as $k=>$v)
+                foreach ($list AS $k=>$v)
                 {
                     $aiReport = ReportModel::where('exam_id',$v['exam_id'])->where('type',3)->value('id');
                     if(empty($aiReport))
@@ -284,7 +284,7 @@ class ExamModel extends ZskkDefaultModel {
             }
             $institution = InstitutionModel::where('id',$institutionId)->value('custom_field');
             $unit = InstitutionModel::where('id',$institutionId)->value('image_unit_code');
-            foreach ($list as $k=>$v)
+            foreach ($list AS $k=>$v)
             {
                 $list[$k]['studytime'] = '';
                 $studyTime = StudiesModel::where('id',$v['study_id'])->value('studytime');
@@ -313,9 +313,9 @@ class ExamModel extends ZskkDefaultModel {
         try{
             $order = "e.doctor_sign desc,e.exam_datetime desc,e.createdAt desc";
             $field = [
-                'e.name', 'e.sex', 'e.age','e.patient_id as pid','e.hopitalized_no','e.bed_no','e.patient_area','e.body_part','e.application_department','e.application_doctor','e.out_patient','e.delivery_doctor','e.his_patient_id',
-                'e.id as exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', "CONCAT(study_id,'&node_type=',node_type) as study_id", 'e.exam_status', 'e.accession_num', 'e.exam_project','e.medical_code','e.body_part_code','e.device_code','e.exam_datetime_code',
-                'r.report_result', 'r.report_datetime','r.id as rid','e.doctor_sign','e.patient_source','e.node_type',
+                'e.name', 'e.sex', 'e.age','e.patient_id AS pid','e.hopitalized_no','e.bed_no','e.patient_area','e.body_part','e.application_department','e.application_doctor','e.out_patient','e.delivery_doctor','e.his_patient_id',
+                'e.id AS exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', "CONCAT(study_id,'&node_type=',node_type) AS study_id", 'e.exam_status', 'e.accession_num', 'e.exam_project','e.medical_code','e.body_part_code','e.device_code','e.exam_datetime_code',
+                'r.report_result', 'r.report_datetime','r.id AS rid','e.doctor_sign','e.patient_source','e.node_type',
                 'r.report_doctor_name','r.report_datetime',
                 'r.review_doctor_name','r.review_datetime',
                 'r.confirm_doctor_name','r.confirm_datetime',
@@ -349,7 +349,7 @@ class ExamModel extends ZskkDefaultModel {
             $institution = InstitutionModel::where('id',$institutionId)->value('custom_field');
             $allIns = InstitutionModel::whereIn('id',$institutionIds)->column('id,name');
             $unit = InstitutionModel::where('id',$institutionId)->value('image_unit_code');
-            foreach ($list as $k=>$v)
+            foreach ($list AS $k=>$v)
             {
                 $list[$k]['studytime'] = '';
                 $studyTime = StudiesModel::where('id',$v['study_id'])->value('studytime');
@@ -396,13 +396,13 @@ class ExamModel extends ZskkDefaultModel {
             $field = [
                 'a.name', 'a.sex', 'a.age',
                 'a.exam_id', 'a.patient_num', 'a.exam_class', 'a.exam_datetime', 'a.study_id',  'a.accession_num', 'a.exam_project','a.remote_institution_name',
-                'r.report_result', 'r.report_datetime','r.id as rid',
+                'r.report_result', 'r.report_datetime','r.id AS rid',
                 'r.report_doctor_name',
                 'r.review_doctor_name',
                 'a.report_status',
                 'r.remote_application_id',
-                'a.id as ra_id',
-                'ro.status','ro.id as order_id',
+                'a.id AS ra_id',
+                'ro.status','ro.id AS order_id',
                 'a.remote_doctor_name'
             ];
             $dateWhere = [];
@@ -450,10 +450,10 @@ class ExamModel extends ZskkDefaultModel {
     public function getRemoteList($id,$institutionId)
     {
         $field = [
-//                'p.name', 'p.sex', 'p.age','p.id as pid',
-//                'e.id as exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', 'e.is_remote', 'e.study_id', 'e.exam_status', 'e.accession_num', 'e.exam_project',
-            'r.report_datetime','r.id as rid',
-            'a.*','a.id as ra_id',
+//                'p.name', 'p.sex', 'p.age','p.id AS pid',
+//                'e.id AS exam_id', 'e.patient_num', 'e.exam_class', 'e.exam_datetime', 'e.is_remote', 'e.study_id', 'e.exam_status', 'e.accession_num', 'e.exam_project',
+            'r.report_datetime','r.id AS rid',
+            'a.*','a.id AS ra_id',
         ];
         $list = RemoteModel::alias('a')
             ->join(['report'=>'r'], 'a.id = r.remote_application_id','LEFT')
@@ -482,7 +482,7 @@ class ExamModel extends ZskkDefaultModel {
             ->join(['exams'=>'e'],'e.id=r.exam_id and r.type=1')
             ->where('e.institution_id',$institution)
             ->where($where)
-            ->field(['e.name','r.impression','r.description','e.id as exam_id','e.study_id','r.id as report_id','e.exam_class','e.exam_status'])
+            ->field(['e.name','r.impression','r.description','e.id AS exam_id','e.study_id','r.id AS report_id','e.exam_class','e.exam_status'])
             ->limit(0,10)
             ->select();
         return $data;

+ 4 - 4
server/application/api/model/institution/InstitutionModel.php

@@ -38,7 +38,7 @@ class InstitutionModel extends ZskkDefaultModel {
             ->where('sc.sid',$id)
             ->where('sc.status',1)
             ->order('sc.sort asc')
-            ->field('sc.id as scid,sc.sid,sc.did as id,sc.hid, convert(sc.cost/100,decimal(10,2)) as cost, sc.describe as introduce,i.name as institution_name, d.realname')
+            ->field('sc.id AS scid,sc.sid,sc.did AS id,sc.hid, convert(sc.cost/100,decimal(10,2)) AS cost, sc.describe AS introduce,i.name AS institution_name, d.realname')
             ->select();
         return $info;
     }
@@ -53,7 +53,7 @@ class InstitutionModel extends ZskkDefaultModel {
     {
         $info = SremoteModel::where('status',1)
             ->order('sort asc')
-            ->field('id, name as hospital_name,1 as is_special')
+            ->field('id, name AS hospital_name,1 AS is_special')
             ->select();
         return $info;
     }
@@ -65,14 +65,14 @@ class InstitutionModel extends ZskkDefaultModel {
             ->join('remote_cost rc',"rc.super_doctor_id=d.id and rc.exam_class='".$class."' and super_hospital_id=d.institution_id and hospital_id='".$remote."'")
             ->where('d.institution_id',$id)
             ->where('d.is_admin','1')
-            ->field('d.id,d.institution_id as hid,d.realname,convert(rc.money/100,decimal(10,2)) as cost,introduce,null as scid,null as sid')
+            ->field('d.id,d.institution_id AS hid,d.realname,convert(rc.money/100,decimal(10,2)) AS cost,introduce,null AS scid,null AS sid')
             ->select();
         if(empty(json_decode(json_encode($info),true))){
             $info = DoctorModel::alias('d')
                 ->join('doctor_class dc','dc.doctor_id=d.id and find_in_set("7", dc.doctor_class)')
                 ->join('remote_cost rc',"rc.super_doctor_id=d.id and rc.exam_class='".$class."' and super_hospital_id=d.institution_id and hospital_id='".$remote."'")
                 ->where('d.institution_id',$id)
-                ->field('d.id,d.institution_id as hid,realname,d.introduce,convert(rc.money/100,decimal(10,2)) as cost,null as scid,null as sid')
+                ->field('d.id,d.institution_id AS hid,realname,d.introduce,convert(rc.money/100,decimal(10,2)) AS cost,null AS scid,null AS sid')
                 ->select();
         }
         return $info;

+ 1 - 1
server/application/api/model/message/MessageModel.php

@@ -70,7 +70,7 @@ class MessageModel extends ZskkDefaultModel {
         $info = $this->where('is_read',0)
 //            ->where('notice',0)
             ->where("(institution_id='$insId' and doctor_id is null) or doctor_id='$id'")
-            ->field("count(*) as count,application_id")
+            ->field("count(*) AS count,application_id")
             ->group('application_id')
             ->select();
         return $info;

+ 5 - 5
server/application/api/model/remote/RemoteModel.php

@@ -82,7 +82,7 @@ class RemoteModel extends ZskkDefaultModel {
     {
         $field = [
             'ra.*',
-            'r.id as rid'
+            'r.id AS rid'
         ];
         if(isset($params['num']) && !empty($params['num']))
         {
@@ -156,7 +156,7 @@ class RemoteModel extends ZskkDefaultModel {
     {
         $field = [
             'ra.*',
-            'r.id as rid'
+            'r.id AS rid'
         ];
         $date1 = [];
         $date2 = [];
@@ -220,7 +220,7 @@ class RemoteModel extends ZskkDefaultModel {
     {
         $field = [
             'ra.*',
-            'r.id as rid'
+            'r.id AS rid'
         ];
         $date1 = [];
         $date2 = [];
@@ -311,7 +311,7 @@ class RemoteModel extends ZskkDefaultModel {
     {
         $field = [
             'ra.*',
-            'r.id as rid'
+            'r.id AS rid'
         ];
         $date1 = [];
         $date2 = [];
@@ -454,7 +454,7 @@ class RemoteModel extends ZskkDefaultModel {
         $data = RecordModel::alias('r')
             ->join(['doctors'=>'d'], 'r.doctor_id = d.id')
             ->where('r.report_id', $id)
-            ->field('r.impression, r.description, r.createdAt as handle_time, d.realname, r.type')
+            ->field('r.impression, r.description, r.createdAt AS handle_time, d.realname, r.type')
             ->select();
         return $data;
     }

+ 44 - 44
server/application/api/model/report/ReportModel.php

@@ -59,13 +59,13 @@ class ReportModel extends ZskkDefaultModel {
     {
         // 获取数据
         $field = [
-            'e.patient_num','e.exam_class',  'e.exam_datetime', 'e.exam_status','re.body_part',"CONCAT(study_id,'&node_type=',node_type) as study_id",'e.node_type','e.institution_id',
+            'e.patient_num','e.exam_class',  'e.exam_datetime', 'e.exam_status','re.body_part',"CONCAT(study_id,'&node_type=',node_type) AS study_id",'e.node_type','e.institution_id',
             'e.name', 'e.sex', 'e.age', 'e.phone','e.exam_project','e.hopitalized_no','e.accession_num','e.write_report',
-            'r.id as report_id, r.impression', 'r.description', 'r.report_result', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime', 'r.confirm_doctor_id','r.confirm_doctor_name', 'r.confirm_datetime', 'r.report_result','r.remote_application_id','r.qr_code',
+            'r.id AS report_id, r.impression', 'r.description', 'r.report_result', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime', 'r.confirm_doctor_id','r.confirm_doctor_name', 'r.confirm_datetime', 'r.report_result','r.remote_application_id','r.qr_code',
             're.exam_sub_class','hr_status',
-            'dp.is_use_autograph as report_use_autograph','dp.autograph as report_autograph','dp.autograph_type as report_autograph_type',
-            'dv.is_use_autograph as review_use_autograph','dv.autograph as review_autograph','dv.autograph_type as  review_autograph_type',
-            'dc.is_use_autograph as confirm_use_autograph','dc.autograph as confirm_autograph','dc.autograph_type as confirm_autograph_type',
+            'dp.is_use_autograph AS report_use_autograph','dp.autograph AS report_autograph','dp.autograph_type AS report_autograph_type',
+            'dv.is_use_autograph AS review_use_autograph','dv.autograph AS review_autograph','dv.autograph_type AS  review_autograph_type',
+            'dc.is_use_autograph AS confirm_use_autograph','dc.autograph AS confirm_autograph','dc.autograph_type AS confirm_autograph_type',
         ];
         $detail =ExamModel::alias('e')
             ->join(['register'=>'re'],'re.exam_id=e.id','LEFT')
@@ -86,11 +86,11 @@ class ReportModel extends ZskkDefaultModel {
         $field = [
             'e.patient_num','e.exam_class',  'e.exam_datetime','e.body_part','e.study_id','e.hopitalized_no',
             'e.name', 'e.sex', 'e.age', 'e.phone','e.report_status','e.local_institution_name','e.req_doctor_name','e.remote_department',
-            'r.id as report_id, r.impression', 'r.description', 'r.report_result', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime', 'r.confirm_doctor_id','r.confirm_doctor_name', 'r.confirm_datetime', 'r.report_result','r.remote_application_id','r.qr_code',
+            'r.id AS report_id, r.impression', 'r.description', 'r.report_result', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime', 'r.confirm_doctor_id','r.confirm_doctor_name', 'r.confirm_datetime', 'r.report_result','r.remote_application_id','r.qr_code',
             'e.exam_project','e.accession_num',
-            'dp.is_use_autograph as report_use_autograph','dp.autograph as report_autograph','dp.autograph_type as report_autograph_type',
-            'dv.is_use_autograph as review_use_autograph','dv.autograph as review_autograph','dv.autograph_type as  review_autograph_type',
-            'dc.is_use_autograph as confirm_use_autograph','dc.autograph as confirm_autograph','dc.autograph_type as confirm_autograph_type','e.local_institution_id as institution_id'
+            'dp.is_use_autograph AS report_use_autograph','dp.autograph AS report_autograph','dp.autograph_type AS report_autograph_type',
+            'dv.is_use_autograph AS review_use_autograph','dv.autograph AS review_autograph','dv.autograph_type AS  review_autograph_type',
+            'dc.is_use_autograph AS confirm_use_autograph','dc.autograph AS confirm_autograph','dc.autograph_type AS confirm_autograph_type','e.local_institution_id AS institution_id'
         ];
         $detail = RemoteModel::alias('e')
             ->join(['report'        => 'r'],"r.remote_application_id =e.id",'LEFT')
@@ -144,7 +144,7 @@ class ReportModel extends ZskkDefaultModel {
         $data = RecordModel::alias('r')
             ->join(['doctors'=>'d'], 'r.doctor_id = d.id')
             ->where('r.report_id', $reportId)
-            ->field('r.impression, r.description, r.report_result, r.createdAt as handle_time, d.realname, r.type')
+            ->field('r.impression, r.description, r.report_result, r.createdAt AS handle_time, d.realname, r.type')
             ->order('r.createdat')
             ->select();
         return $data;
@@ -301,8 +301,8 @@ class ReportModel extends ZskkDefaultModel {
             //远程
             $field = [
                 'e.accession_num', 'e.exam_project',  'e.exam_class', 'e.patient_num',   'e.exam_datetime','e.hopitalized_no',
-                'e.name', 'e.sex', 'e.age', 'e.phone','e.exam_sub_class',"'' as patient_area","'' as out_patient",
-                'e.remote_institution_name as institution_name',
+                'e.name', 'e.sex', 'e.age', 'e.phone','e.exam_sub_class',"'' AS patient_area","'' AS out_patient",
+                'e.remote_institution_name AS institution_name',
                 'r.impression', 'r.description', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime','r.qr_code','r.confirm_doctor_name'
             ];
             $detail = PublicApplicationModel::alias('e')
@@ -316,7 +316,7 @@ class ReportModel extends ZskkDefaultModel {
                 're.clin_doctors_name','re.register_name','re.technician_name','e.application_department',
                 'e.accession_num', 'e.exam_project',  'e.exam_class', 'e.patient_num', 'e.hopitalized_no', 'e.bed_no',  'e.exam_datetime','e.institution_id',
                 'e.name', 'e.sex', 'e.age', 'e.phone','e.exam_sub_class','e.patient_area',"e.out_patient",
-                'i.name as institution_name','e.body_part','i.review_print','i.hr_info','r.hr_status',
+                'i.name AS institution_name','e.body_part','i.review_print','i.hr_info','r.hr_status',
                 'r.impression', 'r.description', 'r.report_doctor_id','r.report_doctor_name', 'r.report_datetime', 'r.review_doctor_id','r.review_doctor_name', 'r.review_datetime','r.qr_code','r.confirm_doctor_name'
             ];
             $detail =$this->alias('r')
@@ -459,7 +459,7 @@ class ReportModel extends ZskkDefaultModel {
             ->where('institution_id',$institutionId)
             ->where($timeWhere)
             ->where('exam_status',9)
-            ->field('e.*,r.id as report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt as report_create,r.updatedAt as report_update')
+            ->field('e.*,r.id AS report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt AS report_create,r.updatedAt AS report_update')
             ->order('e.createdAt desc')
             ->page($page,$num)
             ->select();
@@ -771,24 +771,24 @@ class ReportModel extends ZskkDefaultModel {
     public function getWorkList()
     {
         $field = [
-            'accession_num as AccessionNumber',
-            "e.birthday as DateOfBirth",    //生日
-            "e.patient_num as PatientID",   //患者ID
-            "e.name as Surname",            //姓
-            "'' as Forename",               //名
-            "'' as Title",                  //Title
-            "e.sex as Sex",                 //患者性别
-            "e.exam_class as Modality",     //检查类型
-            "'' as ExamDescription",        //检查描述
-            "'' as ExamRoom",               //检查科室
-            "i.name as HospitalName",       //医院名称
-            "'' as PerformingPhysician",    //执行医生
-            "'' as ProcedureID",            //过程ID
-            "'' as ProcedureStepID",        //过程ID2
-            "e.studyuid as StudyUID",       //StudyUid
-            "'' as ScheduledAET",           // AETiTLE
-            "'' as ReferringPhysician",     //指派医生
-            'e.exam_datetime as ExamDateAndTime',
+            'accession_num AS AccessionNumber',
+            "e.birthday AS DateOfBirth",    //生日
+            "e.patient_num AS PatientID",   //患者ID
+            "e.name AS Surname",            //姓
+            "'' AS Forename",               //名
+            "'' AS Title",                  //Title
+            "e.sex AS Sex",                 //患者性别
+            "e.exam_class AS Modality",     //检查类型
+            "'' AS ExamDescription",        //检查描述
+            "'' AS ExamRoom",               //检查科室
+            "i.name AS HospitalName",       //医院名称
+            "'' AS PerformingPhysician",    //执行医生
+            "'' AS ProcedureID",            //过程ID
+            "'' AS ProcedureStepID",        //过程ID2
+            "e.studyuid AS StudyUID",       //StudyUid
+            "'' AS ScheduledAET",           // AETiTLE
+            "'' AS ReferringPhysician",     //指派医生
+            'e.exam_datetime AS ExamDateAndTime',
         ];
         $info = ExamModel::alias('e')
             ->join(['institution'=>'i'],'i.id=e.institution_id')
@@ -861,7 +861,7 @@ class ReportModel extends ZskkDefaultModel {
 
     public function getRisVersion()
     {
-        $info = VersionModel::field("MAX(versionTime) as time,project")->group('project')->select()->toArray();
+        $info = VersionModel::field("MAX(versionTime) AS time,project")->group('project')->select()->toArray();
         return $info;
     }
 
@@ -1119,12 +1119,12 @@ class ReportModel extends ZskkDefaultModel {
     public function getDmReport($date1, $date2)
     {
         $field = [
-            'e.ID','r.id as REPORT_ID','patient_source as PAT_FROM_TYPE','patient_num as PAT_NUM','exam_project as TESTLIST',
-            'e.NAME','SEX','BIRTHDAY',"'' as ADDRESS",'phone as TEL','institution_id as ORG_CODE',
-            'e.application_department as DEP_NAME',"'' as DEP_CODE",'application_doctor as DUTY_DOCTOR_NAME',"'' as DUTY_DOCTOR_ID",
-            "'' as CHIEF_COMPLAINT",'clin_diag as DIAGNOSIS',"'' as STUDY_BODYPART",'exam_class as IMAGE_TYPE_NAME',
-            'description as FINDING','impression as CONCLUSION','confirm_datetime as HAPPEN_TIME','r.createdAt as SYSTEMTIME',
-            'e.institution_id as HOSPITAL_CODE','r.updatedAt as UPDATE_TIME'
+            'e.ID','r.id AS REPORT_ID','patient_source AS PAT_FROM_TYPE','patient_num AS PAT_NUM','exam_project AS TESTLIST',
+            'e.NAME','SEX','BIRTHDAY',"'' AS ADDRESS",'phone AS TEL','institution_id AS ORG_CODE',
+            'e.application_department AS DEP_NAME',"'' AS DEP_CODE",'application_doctor AS DUTY_DOCTOR_NAME',"'' AS DUTY_DOCTOR_ID",
+            "'' AS CHIEF_COMPLAINT",'clin_diag AS DIAGNOSIS',"'' AS STUDY_BODYPART",'exam_class AS IMAGE_TYPE_NAME',
+            'description AS FINDING','impression AS CONCLUSION','confirm_datetime AS HAPPEN_TIME','r.createdAt AS SYSTEMTIME',
+            'e.institution_id AS HOSPITAL_CODE','r.updatedAt AS UPDATE_TIME'
         ];
         $data = ExamModel::alias('e')
             ->join(['report'=>'r'],'r.exam_id=e.id and r.type=1')
@@ -1144,7 +1144,7 @@ class ReportModel extends ZskkDefaultModel {
                 ->where('institution_id',$institution)
                 ->whereBetween('r.confirm_datetime',[$date1,$date2])
                 ->where('exam_status',9)
-                ->field('e.*,r.id as report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt as report_create,r.updatedAt as report_update')
+                ->field('e.*,r.id AS report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt AS report_create,r.updatedAt AS report_update')
                 ->order('e.createdAt desc')
                 ->page($page,$num)
                 ->select();
@@ -1161,7 +1161,7 @@ class ReportModel extends ZskkDefaultModel {
                 ->where('re.local_institution_id',$institution)
                 ->whereBetween('r.confirm_datetime',[$date1,$date2])
                 ->where('re.report_status',9)
-                ->field('e.*,r.id as report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt as report_create,r.updatedAt as report_update,re.local_institution_id,re.local_institution_name,re.req_doctor_id,re.req_doctor_name,re.req_date_time,re.remote_institution_id,re.remote_institution_name,re.remote_doctor_id,re.remote_doctor_name')
+                ->field('e.*,r.id AS report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt AS report_create,r.updatedAt AS report_update,re.local_institution_id,re.local_institution_name,re.req_doctor_id,re.req_doctor_name,re.req_date_time,re.remote_institution_id,re.remote_institution_name,re.remote_doctor_id,re.remote_doctor_name')
                 ->order('re.req_date_time desc')
                 ->page($page,$num)
                 ->select();
@@ -1176,7 +1176,7 @@ class ReportModel extends ZskkDefaultModel {
                 ->join(['exams'=>'e'],'r.exam_id=e.id')
                 ->where('e.institution_id',$institution)
                 ->whereBetween('r.confirm_datetime',[$date1,$date2])
-                ->field('e.*,r.id as report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt as report_create,r.updatedAt as report_update,r.type')
+                ->field('e.*,r.id AS report_id,r.impression,r.description,r.report_datetime,r.report_doctor_name,r.review_doctor_name,r.review_datetime,r.confirm_doctor_name,r.confirm_datetime,r.report_result,r.createdAt AS report_create,r.updatedAt AS report_update,r.type')
                 ->order('r.confirm_datetime desc')
                 ->page($page,$num)
                 ->select();
@@ -1186,7 +1186,7 @@ class ReportModel extends ZskkDefaultModel {
                 ->whereBetween('r.confirm_datetime',[$date1,$date2])
                 ->count();
         }
-        foreach ($info as $k=>$v)
+        foreach ($info AS $k=>$v)
         {
             $info[$k]['impression'] = strip_tags($v['impression']);
             $info[$k]['description'] = strip_tags($v['description']);
@@ -1216,7 +1216,7 @@ class ReportModel extends ZskkDefaultModel {
         {
             return [];
         }
-        $data = PatientbindModel::where('user_id',$wx_id)->order('createdAt desc')->field(['user_id as id','patientName','idCard','phone'])->find();
+        $data = PatientbindModel::where('user_id',$wx_id)->order('createdAt desc')->field(['user_id AS id','patientName','idCard','phone'])->find();
         if(empty($data))
         {
             return ['patient'=>[],'exams'=>[],'wx_id'=>$wx_id];

+ 3 - 3
server/application/api/model/template/TemplateModel.php

@@ -13,7 +13,7 @@ class TemplateModel extends ZskkDefaultModel {
     {
         $data =$this->where('is_public', 1)
             ->where('exam_class_id', $constantValue)
-            ->field('id, title, exam_class_id, description, impression, parent_id as pid')
+            ->field('id, title, exam_class_id, description, impression, parent_id AS pid')
             ->select();
         return $data;
     }
@@ -33,7 +33,7 @@ class TemplateModel extends ZskkDefaultModel {
         $data = $this->where('is_public', 2)
             ->where('exam_class_id', $constantValue)
             ->where('create_user', $uid)
-            ->field('id, title, exam_class_id, description, impression, parent_id as pid')
+            ->field('id, title, exam_class_id, description, impression, parent_id AS pid')
             ->select();
         return $data;
     }
@@ -96,7 +96,7 @@ class TemplateModel extends ZskkDefaultModel {
 
     public function getTemplate($id)
     {
-        $info = $this->where('id',$id)->field('title as label,impression,description,exam_class_id,parent_id')->find();
+        $info = $this->where('id',$id)->field('title AS label,impression,description,exam_class_id,parent_id')->find();
         return $info;
     }
 

+ 2 - 2
server/application/api/model/xz/XzModel.php

@@ -228,7 +228,7 @@ class XzModel extends ZskkDefaultModel {
         $info = ImageModel::alias('i')
             ->join(['series'=>'s'],'s.id=i.series_id')
             ->where('s.study_id',$study)
-            ->field(['i.id','i.url','i.sopUid','s.id as series_id','s.study_id','i.sopUid'])
+            ->field(['i.id','i.url','i.sopUid','s.id AS series_id','s.study_id','i.sopUid'])
             ->select()
             ->toArray();
         return $info;
@@ -283,7 +283,7 @@ class XzModel extends ZskkDefaultModel {
             ->join(['report'=>'r'],'r.remote_application_id=a.id','left')
             ->where("a.local_institution_id like '73090%'")
             ->page($page,$num)
-            ->field('r.*,a.*,r.id as rid')
+            ->field('r.*,a.*,r.id AS rid')
             ->select()
             ->toArray();
         return $report;