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

src/main/java/thyyxxk/webserver/constants/Capacity.java

@@ -11,7 +11,6 @@ public class Capacity {
     public static final Integer THREE = 3;
     public static final Integer FOUR = 4;
     public static final Integer FIVE = 5;
-    public static final Integer SIX = 6;
     public static final Integer EIGHT = 8;
     public static final Integer NINE = 9;
     public static final Integer TWENTY = 20;

src/main/java/thyyxxk/webserver/constants/ExternalAddr.java

@@ -1,21 +0,0 @@
-package thyyxxk.webserver.constants;
-
-/**
- * @author dj
- */
-public class ExternalAddr {
-
-    public final static String QUERY_PATIENT_INFO = "http://webhis.thyy.cn:81/thmz/api/v1/queryPatientInfo";
-
-    public final static String GET_MZ_CHARGE_DETAIL_FOR_UN_PAID = "http://webhis.thyy.cn:81/thmz/api/v1/getMzChargeDetailForUnPaid";
-
-    public static final String UN_PAID_TO_FULL_CHARGE_DETAIL = "http://webhis.thyy.cn:81/thmz/api/v1/unPaidToFullChargeDetail";
-
-    public static final String GET_CHARGE_DETAIL_BY_HIS_ORD_NUM = "http://webhis.thyy.cn:81/thmz/api/v1/getChargeDetailByHisOrdNum";
-
-    public static final String PAY_CHARGE_DETAIL_FORM_DBZSF = "http://webhis.thyy.cn:81/thmz/api/v1/payChargeDetailFormDbzsf";
-
-    public static final String GEN_MZ_PAY_QRCODE = "http://192.168.200.3:8805/wxserver/wxApi/genMzPayQrcode";
-
-    public static final String HTML_TO_IMAGE = "http://192.168.200.3:8805/htmlToImage/healthCardImage/execute";
-}

src/main/java/thyyxxk/webserver/controller/casefrontsheet/CaseFrontSheetController.java

@@ -66,12 +66,6 @@ public class CaseFrontSheetController {
         return service.getPatientInfo(bah, times, flag);
     }
 
-    @PostMapping("/save")
-    public ResultVo<String> savePatientInfo(@RequestBody OpCaseFrontsheet param) {
-        param.setStaffId(TokenUtil.getTokenUserId());
-        return service.savePatientInfo(param);
-    }
-
     @GetMapping("/getYbDiags")
     public ResultVo<List<YiBaoDisdiag>> getYbDiags(@RequestParam("bah") String bah,
                                                    @RequestParam("times") Integer times) {

src/main/java/thyyxxk/webserver/entity/casefrontsheet/OpCaseFrontsheet.java

@@ -20,11 +20,6 @@ public class OpCaseFrontsheet {
      * */
     private String staffId;
 
-    /**
-     * 在院、出院标志：in:在院    out:出院
-     * */
-    private String flag;
-
     /**
      * 病案首页内容
      * */

src/main/java/thyyxxk/webserver/service/examinations/LisDockService.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.ExternalAddr;
 import thyyxxk.webserver.dao.his.examinations.InspectionsDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.examinations.inspections.InspectionsIndex;
@@ -177,7 +176,8 @@ public class LisDockService {
 
     private String html2image(HealthCardResult param) {
         RestTemplate restTemplate = new RestTemplate();
-        Map<String, Object> res = restTemplate.postForObject(ExternalAddr.HTML_TO_IMAGE, param, Map.class);
+        String htmlToImage = "http://192.168.200.3:8805/htmlToImage/healthCardImage/execute";
+        Map<String, Object> res = restTemplate.postForObject(htmlToImage, param, Map.class);
         log.info("生成图片结果：{}", res);
         if (null == res || null == res.get("code")) {
             return null;

src/main/java/thyyxxk/webserver/service/makedbzfees/MakeDbzFeesService.java

@@ -3,12 +3,12 @@ package thyyxxk.webserver.service.makedbzfees;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.ExternalAddr;
 import thyyxxk.webserver.dao.his.makedbzfees.MakeDbzFeesDao;
 import thyyxxk.webserver.entity.HrgResponse;
 import thyyxxk.webserver.entity.ResultVo;
@@ -27,6 +27,9 @@ public class MakeDbzFeesService {
     private final MakeDbzFeesDao dao;
     private final static int INPATIENT_NO = 2;
 
+    @Value("${hrg-api-url}")
+    private String hrgApiUrl;
+
     @Autowired
     public MakeDbzFeesService(MakeDbzFeesDao dao) {
         this.dao = dao;
@@ -45,7 +48,7 @@ public class MakeDbzFeesService {
         obj.put("patCardNo", patientId);
         obj.put("hisOrdNum", null);
         RestTemplate template = new RestTemplate();
-        HrgResponse hrgRes = template.postForObject(ExternalAddr.GET_MZ_CHARGE_DETAIL_FOR_UN_PAID, obj, HrgResponse.class);
+        HrgResponse hrgRes = template.postForObject(hrgApiUrl + "/getMzChargeDetailForUnPaid", obj, HrgResponse.class);
         if (null == hrgRes || null == hrgRes.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
         }
@@ -63,7 +66,7 @@ public class MakeDbzFeesService {
             p.put("patientId", str[0]);
             p.put("times", str[1]);
             p.put("receiptNo", str[2]);
-            HrgResponse hrgResponse = template.postForObject(ExternalAddr.UN_PAID_TO_FULL_CHARGE_DETAIL, p, HrgResponse.class);
+            HrgResponse hrgResponse = template.postForObject(hrgApiUrl + "/unPaidToFullChargeDetail", p, HrgResponse.class);
             if (null == hrgResponse || null == hrgResponse.getResultCode()) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
             }
@@ -140,7 +143,7 @@ public class MakeDbzFeesService {
         pay.put("times", param.getHisOrdNum().split("_")[1]);
         pay.put("receiptNo", param.getHisOrdNum().split("_")[2]);
         RestTemplate restTemplate = new RestTemplate();
-        HrgResponse hrgResponse = restTemplate.postForObject(ExternalAddr.PAY_CHARGE_DETAIL_FORM_DBZSF, pay, HrgResponse.class);
+        HrgResponse hrgResponse = restTemplate.postForObject(hrgApiUrl + "/payChargeDetailFormDbzsf", pay, HrgResponse.class);
         log.info("保存单病种缴费：{}", hrgResponse);
         if (null == hrgResponse || null == hrgResponse.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");

src/main/java/thyyxxk/webserver/service/markmtfees/MarkMtFeesService.java

@@ -3,11 +3,11 @@ package thyyxxk.webserver.service.markmtfees;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.ExternalAddr;
 import thyyxxk.webserver.constants.ResponceType;
 import thyyxxk.webserver.dao.his.markmtfees.MarkMtFeesDao;
 import thyyxxk.webserver.entity.ResultVo;
@@ -28,6 +28,9 @@ import java.util.Map;
 public class MarkMtFeesService {
     private final MarkMtFeesDao dao;
 
+    @Value("${hrg-api-url}")
+    private String hrgApiUrl;
+
     @Autowired
     public MarkMtFeesService(MarkMtFeesDao dao) {
         this.dao = dao;
@@ -127,7 +130,7 @@ public class MarkMtFeesService {
         queryMzChargeListParam.put("patCardNo", patientId);
         queryMzChargeListParam.put("hisOrdNum", "");
         RestTemplate template = new RestTemplate();
-        Map<String, Object> mzChargeListMap = template.postForObject(ExternalAddr.GET_MZ_CHARGE_DETAIL_FOR_UN_PAID, queryMzChargeListParam, Map.class);
+        Map<String, Object> mzChargeListMap = template.postForObject(hrgApiUrl + "/getMzChargeDetailForUnPaid", queryMzChargeListParam, Map.class);
         if (null == mzChargeListMap) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
         }
@@ -161,7 +164,7 @@ public class MarkMtFeesService {
                 queryMzChargeDetailParam.put("times", times);
                 queryMzChargeDetailParam.put("receiptNo", hisOrdNumParts[2]);
                 mzVisit.setReceiptNo(Integer.parseInt(hisOrdNumParts[2]));
-                Map<String, Object> mzChargeDetailMap = template.postForObject(ExternalAddr.UN_PAID_TO_FULL_CHARGE_DETAIL,
+                Map<String, Object> mzChargeDetailMap = template.postForObject(hrgApiUrl + "/unPaidToFullChargeDetail",
                         queryMzChargeDetailParam, Map.class);
                 if (null != mzChargeDetailMap && 0 == (int) mzChargeDetailMap.get("resultCode")) {
                     List<Map<String, Object>> mzChargeDetailList = FilterUtil.cast(mzChargeDetailMap.get("data"));

src/main/java/thyyxxk/webserver/service/mzpayqrcode/MzPayQrcodeService.java

@@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.ExternalAddr;
 import thyyxxk.webserver.dao.his.mzpayqrcode.MzPayQrcodeDao;
 import thyyxxk.webserver.entity.HrgResponse;
 import thyyxxk.webserver.entity.ResultVo;
@@ -28,6 +28,8 @@ import java.util.Map;
 public class MzPayQrcodeService {
     private final MzPayQrcodeDao dao;
     private static final int MIN_PATIENT_ID_LENGTH = 7;
+    @Value("${hrg-api-url}")
+    private String hrgApiUrl;
 
     @Autowired
     public MzPayQrcodeService(MzPayQrcodeDao dao) {
@@ -40,7 +42,7 @@ public class MzPayQrcodeService {
         obj.put("patIdType", 11);
         obj.put("patIdNo", socialNo);
         RestTemplate template = new RestTemplate();
-        return template.postForObject(ExternalAddr.QUERY_PATIENT_INFO, obj, PatInfo.class);
+        return template.postForObject(hrgApiUrl + "/queryPatientInfo", obj, PatInfo.class);
     }
 
     public ResultVo<List<Map<String, String>>> getRoughList(String patientId) {
@@ -53,7 +55,7 @@ public class MzPayQrcodeService {
         obj.put("patCardNo", patientId);
         obj.put("hisOrdNum", "");
         RestTemplate template = new RestTemplate();
-        HrgResponse hrgRes = template.postForObject(ExternalAddr.GET_MZ_CHARGE_DETAIL_FOR_UN_PAID, obj, HrgResponse.class);
+        HrgResponse hrgRes = template.postForObject(hrgApiUrl + "/getMzChargeDetailForUnPaid", obj, HrgResponse.class);
         if (null == hrgRes || null == hrgRes.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
         }
@@ -78,7 +80,7 @@ public class MzPayQrcodeService {
         pObj.put("patCardNo", param.getPatientId());
         pObj.put("hisOrdNum", param.getHisOrdNum());
         RestTemplate template = new RestTemplate();
-        HrgResponse hrgRes = template.postForObject(ExternalAddr.GET_CHARGE_DETAIL_BY_HIS_ORD_NUM, pObj, HrgResponse.class);
+        HrgResponse hrgRes = template.postForObject(hrgApiUrl + "/getChargeDetailByHisOrdNum", pObj, HrgResponse.class);
         if (null == hrgRes || null == hrgRes.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
         }
@@ -89,7 +91,7 @@ public class MzPayQrcodeService {
         JSONObject retObj = new JSONObject();
         retObj.put("list", makeSimpleData(list));
         RestTemplate restTemplate = new RestTemplate();
-        ResultVo<String> qrResult = restTemplate.postForObject(ExternalAddr.GEN_MZ_PAY_QRCODE, param, ResultVo.class);
+        ResultVo<String> qrResult = restTemplate.postForObject(hrgApiUrl + "/genMzPayQrcode", param, ResultVo.class);
         if (null == qrResult || qrResult.getCode() != ExceptionEnum.SUCCESS.getCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请求微信支付二维码失败，请联系管理员。");
         }

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

@@ -3,47 +3,52 @@
     {
       "name": "UPLOAD_BASE",
       "type": "java.lang.String",
-      "description": "Description for UPLOAD_BASE."
+      "description": "none."
     },
     {
       "name": "CSSYB_BASE",
       "type": "java.lang.String",
-      "description": "Description for CSSYB_BASE."
+      "description": "none."
     },
     {
       "name": "HNSYB_BASE",
       "type": "java.lang.String",
-      "description": "Description for HNSYB_BASE."
+      "description": "none."
     },
     {
       "name": "XNHYB_BASE",
       "type": "java.lang.String",
-      "description": "Description for XNHYB_BASE."
+      "description": "none."
     },
     {
       "name": "CSSYB_READ_MZ_PATIENT",
       "type": "java.lang.String",
-      "description": "Description for CSSYB_READ_MZ_PATIENT."
+      "description": "none."
     },
     {
       "name": "CSSYB_MT_INFO",
       "type": "java.lang.String",
-      "description": "Description for CSSYB_MT_INFO."
+      "description": "none."
     },
     {
       "name": "HNSYB_MT_INFO",
       "type": "java.lang.String",
-      "description": "Description for HNSYB_MT_INFO."
+      "description": "none."
     },
     {
       "name": "CSSYB_MT_PRE_CAL",
       "type": "java.lang.String",
-      "description": "Description for CSSYB_MT_PRE_CAL."
+      "description": "none."
     },
     {
       "name": "PROOFREAD",
       "type": "java.lang.String",
-      "description": "Description for PROOFREAD."
+      "description": "none."
+    },
+    {
+      "name": "hrg-api-url",
+      "type": "java.lang.String",
+      "description": "Description for hrg-api-url."
     }
   ]
 }

src/main/resources/application-dev.yml

@@ -20,13 +20,14 @@ spring:
           password: "hnthxyyy"
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    minimum-idle: 10
-    idle-timeout: 180000
-    maximum-pool-size: 30
-    auto-commit: true
-    pool-name: lisDbPool
-    connection-timeout: 30000
-    connection-test-query: select 1
+    hikari:
+      minimum-idle: 10
+      idle-timeout: 180000
+      maximum-pool-size: 30
+      auto-commit: true
+      pool-name: lisDbPool
+      connection-timeout: 30000
+      connection-test-query: select 1
   rabbitmq:
     host: 192.168.200.3
     port: 5672
@@ -39,7 +40,7 @@ spring:
     format:
       date: yyyy-MM-dd
       date-time: yyyy-MM-dd HH:mm:ss
-mybatis:
+mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
 

src/main/resources/application-prod.yml

@@ -20,13 +20,14 @@ spring:
           password: "hnthxyyy"
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    minimum-idle: 10
-    idle-timeout: 180000
-    maximum-pool-size: 30
-    auto-commit: true
-    pool-name: lisDbPool
-    connection-timeout: 30000
-    connection-test-query: select 1
+    hikari:
+      minimum-idle: 10
+      idle-timeout: 180000
+      maximum-pool-size: 30
+      auto-commit: true
+      pool-name: lisDbPool
+      connection-timeout: 30000
+      connection-test-query: select 1
   rabbitmq:
     host: 192.168.200.3
     port: 5672
@@ -39,7 +40,7 @@ spring:
     format:
       date: yyyy-MM-dd
       date-time: yyyy-MM-dd HH:mm:ss
-mybatis:
+mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
 logging:

src/main/resources/application.yml

@@ -29,13 +29,14 @@ spring:
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    minimum-idle: 10
-    idle-timeout: 180000
-    maximum-pool-size: 30
-    auto-commit: true
-    pool-name: lisDbPool
-    connection-timeout: 30000
-    connection-test-query: select 1
+    hikari:
+      minimum-idle: 10
+      idle-timeout: 180000
+      maximum-pool-size: 30
+      auto-commit: true
+      pool-name: lisDbPool
+      connection-timeout: 30000
+      connection-test-query: select 1
   rabbitmq:
     host: 172.16.30.26 #测试
     port: 5672
@@ -48,9 +49,10 @@ spring:
     format:
       date: yyyy-MM-dd
       date-time: yyyy-MM-dd HH:mm:ss
-mybatis:
+mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
+
 UPLOAD_BASE:
   http://172.16.30.26
 CSSYB_BASE:
@@ -69,3 +71,5 @@ CSSYB_MT_PRE_CAL:
   http://172.16.30.26:1000/mzsyb/mzPreCalculate
 PROOFREAD:
   http://172.16.30.26:1111/proofread/start
+
+hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1