Merge branch 'master' of https://gitlab.taihe.com/lighter/web-server

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>8.2</version>
+    <version>8.3</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/controller/powersi/PowerSiApiController.java

@@ -0,0 +1,57 @@
+package thyyxxk.webserver.controller.powersi;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.utils.FilterUtil;
+import thyyxxk.webserver.utils.ResultVoUtil;
+import thyyxxk.webserver.utils.TokenUtil;
+
+/**
+ * @description: 创智中台接口
+ * @author: DingJie
+ * @create: 2021-05-27 10:10:57
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/powersi")
+public class PowerSiApiController {
+    @Value("${powersi-api-url}")
+    private String powersiApiUrl;
+
+    @GetMapping("/getEmpiViewUrl")
+    public ResultVo<String> getEmpiViewUrl(@RequestParam("id") String id) {
+        log.info("【操作员：{}】，请求患者360视图：{}", TokenUtil.getTokenUserId(), id);
+        JSONObject param = new JSONObject();
+        param.put("de000000009", "");
+        param.put("de000000010", id);
+        RestTemplate template = new RestTemplate();
+        String url = powersiApiUrl + "/empiDataProvide/queryEmpiPatientListByIdentIndex";
+        JSONObject result = template.postForObject(url, param, JSONObject.class);
+        if (null == result) {
+            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
+        }
+        if (result.getIntValue("code") != 0) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString("msg"));
+        }
+        JSONArray data = result.getJSONArray("data");
+        if (null == data || data.size() == 0) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此患者的主索引。");
+        }
+        JSONObject index = data.getJSONObject(0);
+        String empiViewUrl = String.format("http://172.16.32.183:9002/mmg_business_thyy/business/#/360pat/patientView?" +
+                        "mainIndex=%s&patName=%s&sexName=%s&visitId=%s&tag=patientTime",
+                index.getString("de000000007"), index.getString("de020103900"),
+                FilterUtil.filterSex(index.getString("de020104000")), id);
+        return ResultVoUtil.success(empiViewUrl);
+    }
+
+}

src/main/java/thyyxxk/webserver/service/medicalinsurance/MedicalInsuranceService.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.service.medicalinsurance;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.constants.MedicalInsuranceFunction;
@@ -17,6 +18,8 @@ import thyyxxk.webserver.utils.SiMsgIdUtil;
 @Slf4j
 @Service
 public class MedicalInsuranceService {
+    @Value("${si-api-url}")
+    private String siApiUrl;
 
     public ResultVo<JSONObject> obtainBasicPersonInfo(String socialNo, String name) {
         JSONObject header = makeParamHeader(MedicalInsuranceFunction.OBTAIN_BASIC_PERSON_INFO);
@@ -30,6 +33,7 @@ public class MedicalInsuranceService {
         param.put("psn_name", name);
         header.getJSONObject("input").put("data", param);
         RestTemplate template = new RestTemplate();
+        JSONObject result = template.postForObject(siApiUrl, param, JSONObject.class);
         return null;
     }
 

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -49,6 +49,16 @@
       "name": "hrg-api-url",
       "type": "java.lang.String",
       "description": "Description for hrg-api-url."
+    },
+    {
+      "name": "si-api-url",
+      "type": "java.lang.String",
+      "description": "医保中心地址."
+    },
+    {
+      "name": "powersi-api-url",
+      "type": "java.lang.String",
+      "description": "创智中台api地址."
     }
   ]
 }

src/main/resources/application-dev.yml

@@ -62,3 +62,7 @@ CSSYB_MT_PRE_CAL:
   http://172.16.30.26:1000/mzsyb/mzPreCalculate
 PROOFREAD:
   http://172.16.30.26:1111/proofread/start
+
+si-api-url: https://www.baidu.com
+hrg-api-url: http://172.16.30.33:8089/thmz/api/v1
+powersi-api-url: http://172.16.32.183:8916/mmg-gateway

src/main/resources/application-prod.yml

@@ -65,3 +65,7 @@ CSSYB_MT_PRE_CAL:
   http://172.16.32.163:1000/mzsyb/mzPreCalculate
 PROOFREAD:
   http://172.16.32.163:1111/proofread/start
+
+si-api-url: https://www.baidu.com
+hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
+powersi-api-url: http://172.16.32.183:8916/mmg-gateway

src/main/resources/application.yml

@@ -77,4 +77,6 @@ CSSYB_MT_PRE_CAL:
 PROOFREAD:
   http://172.16.30.26:1111/proofread/start
 
+si-api-url: https://www.baidu.com
 hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
+powersi-api-url: http://172.16.32.183:8916/mmg-gateway