xg

server/application/api/dao/link/LinkDao.php

@@ -156,7 +156,7 @@ class LinkDao extends ZskkDefaultDao {
 
         if(empty($report))
         {
-            $examField = ['name','sex','age','is_dcm','application_department','accession_num','hopitalized_no','bed_no','exam_class','exam_datetime','exam_project',"study_id",'pay_status','id AS exam_id','exam_status','institution_id',"'' AS id",'patient_num',"'' AS message","'' AS report_subtitle","'' AS report_title"];
+            $examField = ['NAME','SEX','AGE','IS_DCM','APPLICATION_DEPARTMENT','ACCESSION_NUM','HOPITALIZED_NO','BED_NO','EXAM_CLASS','EXAM_DATETIME','EXAM_PROJECT',"STUDY_ID",'PAY_STATUS','ID AS EXAM_ID','EXAM_STATUS','INSTITUTION_ID',"'' AS ID",'PATIENT_NUM',"'' AS MESSAGE","'' AS REPORT_SUBTITLE","'' AS REPORT_TITLE"];
             $report = $this->examModel->where('id',$examId)->where('status',1)->field($examField)->select();
         }
         return $report;

server/application/api/servies/link/LinkService.php

@@ -483,12 +483,6 @@ class LinkService extends ZskkDefaultService {
 
     public function getAnotherPatientList($param)
     {
-        $param['code'] = openssl_decrypt(base64_decode($param['code']), 'AES-128-ECB', Config::get('chengde')['key']);
-//        $param['institution_id'] = openssl_decrypt(base64_decode($param['institution_id']), 'AES-128-ECB', Config::get('chengde')['key']);
-        if(empty($param['code']))
-        {
-            $this->throwError('数据解密失败','1210');
-        }
         if(empty($param['type']) || empty($param['code']))
         {
             $this->throwError('没有相应的类型','1211');
@@ -625,7 +619,10 @@ class LinkService extends ZskkDefaultService {
                     $info[$k]['insConfig'] = $value;
                     $info[$k]['config_number'] = $v[$key];
                 }
-                $info[$k]['age'] = str_replace('W','周',str_replace('D','天',str_replace('M','月',str_replace('Y','岁',ltrim($info[$k]['age'],'0')))));
+                if(!empty($v['age']))
+                {
+                    $info[$k]['age'] = str_replace('W','周',str_replace('D','天',str_replace('M','月',str_replace('Y','岁',ltrim($info[$k]['age'],'0')))));
+                }
             }
         }
         return $info;