lgy 4 dagen geleden
bovenliggende
commit
2e40ec32de

+ 12 - 12
jcjyhr/app/zskk/controller/Api.php

@@ -55,22 +55,22 @@ class Api extends ApiController
     public function getShareToken(EmpowerServies $servies, PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','getRecogToken');
         $data = $servies->getRecogToken($params);
         $data = $patientServies->makeMappingData($data,'0','getRecogToken',2);
-//        $data = $this->makeEncryptData($data);
+        $data = $this->makeEncryptData($data);
         $this->success('', $data);
     }
 
     public function getRecogToken(EmpowerServies $servies, PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','getRecogToken');
         $data = $servies->getRecogToken($params);
         $data = $patientServies->makeMappingData($data,'0','getRecogToken',2);
-//        $data = $this->makeEncryptData($data);
+        $data = $this->makeEncryptData($data);
         $this->success('', $data);
     }
 
@@ -104,7 +104,7 @@ class Api extends ApiController
     public function delExamReport(PatientServies $servies)//: void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $tokenData = $this->tokenData;
         if(empty($tokenData))
         {
@@ -139,7 +139,7 @@ class Api extends ApiController
     public function getShareCheck(HrServies $servies,PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','getShareCheck');
         $ID_CARDNUM = $params['ID_CARDNUM'] ?? '';
         $ORGCODE = $params['ORGCODE'] ?? '';
@@ -150,7 +150,7 @@ class Api extends ApiController
         $data = $servies->getShareCheck($ID_CARDNUM, $ORGCODE,$DOCTORCODE,$DEPARTMENT,1);
         $data = $patientServies->makeMappingData(['RETURN'=>$data],'0','getShareCheck',2);
         // halt($data);
-//        $data = $this->makeEncryptData($data);
+        $data = $this->makeEncryptData($data);
         // halt($data);
         $this->success('', $data);
     }
@@ -158,7 +158,7 @@ class Api extends ApiController
     public function getRecogCheck(HrServies $servies,PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','getShareCheck');
         $ID_CARDNUM = $params['ID_CARDNUM'] ?? '';
         $ORGCODE = $params['ORGCODE'] ?? '';
@@ -169,7 +169,7 @@ class Api extends ApiController
         $data = $servies->getShareCheck($ID_CARDNUM, $ORGCODE,$DOCTORCODE,$DEPARTMENT,1,1);
         $data = $patientServies->makeMappingData(['RETURN'=>$data],'0','getShareCheck',2);
         // halt($data);
-//        $data = $this->makeEncryptData($data);
+        $data = $this->makeEncryptData($data);
         // halt($data);
         $this->success('', $data);
     }
@@ -183,7 +183,7 @@ class Api extends ApiController
     public function getRecogData(HrServies $servies,PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($param['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','getRecogData');
         $ID_CARDNUM = $params['ID_CARDNUM'] ?? '';
         $ORGCODE = $params['ORGCODE'] ?? '';
@@ -194,7 +194,7 @@ class Api extends ApiController
         $data = $servies->getShareCheck($ID_CARDNUM, $ORGCODE,$DOCTORCODE,$DEPARTMENT,2);
         // halt($data);
         $data = $patientServies->makeMappingData(['DATA'=>$data],'0','getRecogData',2);
-//        $data = $this->makeEncryptData($data);
+        $data = $this->makeEncryptData($data);
         // halt($data);
         $this->success('', $data);
     }
@@ -207,7 +207,7 @@ class Api extends ApiController
     public function saveRecogResult(HrServies $servies, PatientServies $patientServies): void
     {
         $params = $this->request->post();
-//        $params = $this->getDecryptData($params['data']);
+        $params = $this->getDecryptData($params['data']);
         $params = $patientServies->makeMappingData($params,'0','saveRecogResult');
         $HR_RECORDS = $params['HR_RECORDS'] ?? array();
         $servies->saveRecogResult($HR_RECORDS);

+ 16 - 13
jcjyhr/app/zskk/controller/Patient.php

@@ -94,16 +94,17 @@ class Patient extends ZskkApiController
      */
     public function postExamInfo(PatientServies $servies): void
     {
-//        try {
+        try {
             $params = $this->request->post();
-//            $params = $this->getDecryptData($params['data']);
+            $params = $this->getDecryptData($params['data']);
             $params = $servies->makeMappingData($params,'0','postExamInfo');
             $data = $servies->postExamInfo($params);
+            $data = $this->makeEncryptData($data);
             $this->success($data,'');
-//        }catch (\Exception $e)
-//        {
-//            $this->error($e->getMessage());
-//        }
+        }catch (\Exception $e)
+        {
+            $this->error($e->getMessage());
+        }
     }
     /**
      * 上传检查数据
@@ -112,9 +113,10 @@ class Patient extends ZskkApiController
     {
         try {
             $params = $this->request->post();
-//            $params = $this->getDecryptData($params['data']);
+            $params = $this->getDecryptData($params['data']);
             $params = $servies->makeMappingData($params,'0','postExamReport');
             $data = $servies->postExamReport($params);
+            $data = $this->makeEncryptData($data);
             $this->success($data,'');
         }catch (\Exception $e)
         {
@@ -127,15 +129,16 @@ class Patient extends ZskkApiController
      */
     public function postLisReport(PatientServies $servies): void
     {
-//        try {
+        try {
             $params = $this->request->post();
-//            $params = $this->getDecryptData($params['data']);
+            $params = $this->getDecryptData($params['data']);
             $params = $servies->makeMappingData($params,'0','postLabReport');
             $data = $servies->postLabReport($params);
+            $data = $this->makeEncryptData($data);
             $this->success($data,'');
-//        }catch (\Exception $e)
-//        {
-//            $this->error($e->getMessage());
-//        }
+        }catch (\Exception $e)
+        {
+            $this->error($e->getMessage());
+        }
     }
 }

+ 6 - 6
jcjyhr/app/zskk/servies/EmpowerServies.php

@@ -44,17 +44,17 @@ class EmpowerServies
     {
         $orgCode = $params['clientid']; //机构编码
         $authID = $params['clientsecret'];  //授权码
-//        $institution = $this->institutionModel->where('port_empower',$authID)->where('institution_code',$orgCode)->find();
-//        if(empty($institution))
-//        {
-//            return ['msg'=>'机构编码或授权码错误','data'=>[]];
-//        }
+        $institution = $this->institutionModel->where('port_empower',$authID)->where('institution_code',$orgCode)->find();
+        if(empty($institution))
+        {
+            return ['msg'=>'机构编码或授权码错误','data'=>[]];
+        }
         $key = md5($orgCode.rand(0,99));
         $expire = 3600;
         $aesKey = $this->generateRandomLetters();
         // todo
 //        $aesKey = 'zLxapoeqWYpoeqWY';
-        $institution['id'] = '001';
+//        $institution['id'] = '001';
         $token = base64_encode(md5($orgCode.$institution['id'].$aesKey));
         $arr = ['token'=>$token,'key'=>$aesKey,'expire'=>$expire,'appId'=>$key,'orgCode'=>$orgCode];
 //        if(empty(Cache::get($orgCode)))