结算单不查询政策项

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

@@ -401,7 +401,7 @@ public class SiManageService {
         wrapper.apply("setl_time<='" + enddate + "'");
         if (prm.getMode() == 1) {
             wrapper.apply(prm.getAcctPayFlag() == 1 ? "(fund_pay_sumamt+acct_pay)!=0" : "fund_pay_sumamt!=0");
-            wrapper.apply("insuplc_admdvs like '43%' ");
+            wrapper.apply("insuplc_admdvs like " + areaStmt);
         }
         List<SiSetlinfo> list = setlinfoDao.selectList(wrapper);
 

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

@@ -1031,48 +1031,47 @@ public class SiQueryService {
     }
 
     private ResultVo<PolItemInfo> listPolItemCodePayInfo(String psnNo, String mdtrtId, String setlId, String insuplc) {
-        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.LIST_POL_ITEM_CODE_PAY_INFO, insuplc);
-        JSONObject data = new JSONObject();
-        data.put("psn_no", psnNo);
-        data.put("mdtrt_id", mdtrtId);
-        data.put("setl_id", setlId);
-        input.getJSONObject("input").put("data", data);
-        JSONObject result = exec.executeTrade(input, SiFunction.LIST_POL_ITEM_CODE_PAY_INFO);
-        log.info("【操作员：{}】，政策信息查询：\n参数：{}，\n结果：{}", TokenUtil.getInstance().getTokenUserId(), input, result);
-        if (null == result) {
-            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
-        }
-        if (null == result.getInteger("code")) {
-            String message = result.getString("message");
-            if (null == message) {
-                message = result.getString(ERROR_MESSAGE);
-            }
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + message);
-        }
-        if (result.getIntValue("code") != 0) {
-            String message = result.getString("message");
-            if (null == message) {
-                message = result.getString(ERROR_MESSAGE);
-            }
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心出错：" + message);
-        }
-        PolItemInfo polItemInfo = new PolItemInfo();
-        JSONArray array = result.getJSONArray("data");
-        BigDecimal selfPaySum = new BigDecimal(0);
-        BigDecimal fundPaySum = new BigDecimal(0);
-        List<PolicyItem> policyItems = new ArrayList<>();
-        for (int i = 0; i < array.size(); i++) {
-            JSONObject polObj = array.getJSONObject(i);
-            PolicyItem policyItem = JSONObject.parseObject(JSONObject.toJSONString(polObj), PolicyItem.class);
-            policyItems.add(policyItem);
-            selfPaySum = selfPaySum.add(policyItem.getSelfPayAmt());
-            fundPaySum = fundPaySum.add(policyItem.getFundPayAmt());
-        }
-        polItemInfo.setAllPsnAmt(selfPaySum);
-        polItemInfo.setAllFundAmt(fundPaySum);
-        polItemInfo.setAllSum(fundPaySum.add(selfPaySum));
-        polItemInfo.setPolicyItems(policyItems);
-        return ResultVoUtil.success(polItemInfo);
+//        JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.LIST_POL_ITEM_CODE_PAY_INFO, insuplc);
+//        JSONObject data = new JSONObject();
+//        data.put("psn_no", psnNo);
+//        data.put("mdtrt_id", mdtrtId);
+//        data.put("setl_id", setlId);
+//        input.getJSONObject("input").put("data", data);
+//        JSONObject result = exec.executeTrade(input, SiFunction.LIST_POL_ITEM_CODE_PAY_INFO);
+//        if (null == result) {
+//            return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
+//        }
+//        if (null == result.getInteger("code")) {
+//            String message = result.getString("message");
+//            if (null == message) {
+//                message = result.getString(ERROR_MESSAGE);
+//            }
+//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错：" + message);
+//        }
+//        if (result.getIntValue("code") != 0) {
+//            String message = result.getString("message");
+//            if (null == message) {
+//                message = result.getString(ERROR_MESSAGE);
+//            }
+//            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心出错：" + message);
+//        }
+//        PolItemInfo polItemInfo = new PolItemInfo();
+//        JSONArray array = result.getJSONArray("data");
+//        BigDecimal selfPaySum = new BigDecimal(0);
+//        BigDecimal fundPaySum = new BigDecimal(0);
+//        List<PolicyItem> policyItems = new ArrayList<>();
+//        for (int i = 0; i < array.size(); i++) {
+//            JSONObject polObj = array.getJSONObject(i);
+//            PolicyItem policyItem = JSONObject.parseObject(JSONObject.toJSONString(polObj), PolicyItem.class);
+//            policyItems.add(policyItem);
+//            selfPaySum = selfPaySum.add(policyItem.getSelfPayAmt());
+//            fundPaySum = fundPaySum.add(policyItem.getFundPayAmt());
+//        }
+//        polItemInfo.setAllPsnAmt(selfPaySum);
+//        polItemInfo.setAllFundAmt(fundPaySum);
+//        polItemInfo.setAllSum(fundPaySum.add(selfPaySum));
+//        polItemInfo.setPolicyItems(policyItems);
+        return ResultVoUtil.success(new PolItemInfo());
     }
 
     public CuminfoInYear getYearCuminfo(String setlId, String psnNo, String admdvs) {

src/main/resources/application-mhyy.yml

@@ -9,7 +9,7 @@ server:
     max-connections: 10000
 spring:
   application:
-    name: web-server-dev
+    name: web-server
   thymeleaf:
     cache: false
   datasource:
@@ -72,7 +72,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
 logging:
   level:
-    thyyxxk.webserver.dao: debug
+    thyyxxk.webserver.dao: info
 forest:
   timeout: 0
   read-timeout: 0
@@ -122,67 +122,58 @@ management:
     prometheus:
       enabled: true
 
-is-prod: false
+execute-scheduled: true
+is-prod: true
 
-si-zy-fee-url: http://172.16.30.26:1000
-si-mz-fee-url: http://172.16.30.26:1100/mzFee
-si-injury-fee-url: http://172.16.30.26:2100/siInjury
-si-injury-systm-url: http://172.16.30.26:2000/siInjury
-thmz-api-url: http://172.16.30.119:8089/thmz
-rmHkUserApi: http://172.16.30.66:20923/thyy/api/haikang/door/destructionUser
+si-api-url: http://130.150.161.72:8079/ybjkdz
+si-access-key: a94971b5ecee4bb994bce25c9291ccbf
+si-secret-key: 3ni3n+nWhGCsiu6SITGUqNfzvx8=
+si-zy-fee-url: http://130.150.161.72:1000
+si-mz-fee-url: http://130.150.161.72:1100/mzFee
+si-injury-fee-url:
+si-injury-systm-url:
+thmz-api-url: http://130.150.161.72:8089/thmz
+rmHkUserApi:
 
 thyy:
-  ca:
-    sign-authentication:
-      app-code: ywxt
-      app-pwd: 12345678
-      cert: "MIIB9TCCAZigAwIBAgIOAV53M9Vp5AY8j5DL1EUwDAYIKoEcz1UBg3UFADA+MQswCQYDVQQGEwJDTjEUMBIGA1UEAwwLU00yIFJPT1QgQ0ExCzAJBgNVBAgMAlNIMQwwCgYDVQQKDANoYWgwHhcNMjMwMzA5MDY1MzQyWhcNMjUwMzA5MDY1MzQyWjBZMQswCQYDVQQGEwJDTjELMAkGA1UECAwCU0gxCzAJBgNVBAcMAlNIMQ0wCwYDVQQKDARzaWduMQ0wCwYDVQQLDARzaWduMRIwEAYDVQQDDAlzaWduX3Rlc3QwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAAT9dIroxCUB5oZvxl2Irq3OoAtbWvqa5tNvw854VGmgJxfuuTfgBtcVdEHkbXsSvRNdj9Uq2ld2XFjoaIyHaC1Co10wWzAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFCE77Si3YBk/u4qjZMQAJNHBvWKUMB0GA1UdDgQWBBSjsmDHccu255pXS76XpNE3LL7f7DALBgNVHQ8EBAMCB4AwDAYIKoEcz1UBg3UFAANJADBGAiEAkECq7DAZiONAwDblXKigoyGkmjePKsS2L4noqg/wQuwCIQCGnRJITQ+ErYg/l+YNrAWgY1UtoQnsM8A4XIsUynzu7Q=="
-      sign-aig: "SM3withSM2"
-      url: "http://103.36.136.173:7845/services/CipherServices"
-    mobile-app:
-      app-id: 3
-      url: https://device.mkeysec.net/openapi
-      privatekey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHwpN7M6Xhja7sfaB0K3y2MBd4xLfhOF64mv0mtEZfqaWvphadXAimnfru8Y4sf0wDb9LYjacXRTkRMhZaZq5ZRCNFB+G8HnNb1y9Vr+7VqvT3wlRV0n+Jar+rEFguW293kH6wOLPQVNkmL4xEy/ecI81gfqR0wSHbyVWaBJ4o7w8qYVFc3is0vswl/bpKE2/4ngjEGDNuYdS0oXZR1TOjEEtNPEws9944yHyfYnbJgbTXkO78hlRUUu4tA8UnSjLrO0m0I6aQkuibPHKjMj247q2629L5IQpn+mGpgxmqUQmzSlKf5wg3uE0Ss1Bea8/AneSDBx2tzjsEs2qKn8cfAgMBAAECggEAM18GbaVCjNIPMf/rmmnmPA6AoztVFU0+Un6bcmzfAE3ymz+u6QatY1b+YDJZiS72NYq37yfS5XRVPtOEL9sQ+EhXTETKP2QKZONNTxBOwN166tHHFd6cUgRp2LJLm+cPi9/KgKZELH4e2Vs+qb3AyX2mtm/VjTSTulY6JRjAPF6EIyQqiLIinyw9TUXNqBs1kT5ma/50YPO2pSXWiOcXX9WWL7ECCNLCfKVRCKlEuaHuIozDuuwGHBrALAdqjWxrj0IMywCZIoVbBke+U7+KCKhKsc5eqsUJu8YfoVR3hxVhUHjlqIFbuAlLvrMqYZd3HgT1O3RSp/eOyXRMGsW0kQKBgQDHvA1p9Qv7K62WYOwwHEIg5Qym5uK4ClhvWUUQPE63bhzrkLkfNlDEOFpsnIk1EonvJHbfzW4pKR36AjbGBv9xxdgntkee+35pN8d8MT2eNMyHdsF6TDToKqPmqKHcxXmnpOCtC9Cam1wjBU+e7gdSoAeNWJeKUzg79HN7M7uD6QKBgQCuAPkd1G7GHkhMiXur1Td6nTmzwz9zPeHHycAE2r1epH22VUfKTu/oDgmky/VKO3JJuc1txt2bHs90iTLRDmcMy9l+6Ix9UJzmanAIRzhAVgmwz1liUNLbnJGl0YxCq0qlQA3FUUmOP36C2cvHcJm/hRIPG2O2nT1DLKsHvgU1xwKBgGL6mPciHU7aBUrZOxJYXpjoiQ2Iq1+imNKNPYFfMW8LHT/LV0HVa87hUkYyiHgJeNtOia48olO5cYZ8ZGJcA2iBL632UaXCYZGIt82epTdqWNTkj9qoOyu2PcTHWncKUVA3j7ORgE2tocolDqDmujBC55svBOHifaKQcE3khA9JAoGAf/fLPjrrNN00gsVhpJ/sa0qSEzh2w4QxNkOT6n4MYzxKD/xsDcc7/MfGI+K0BOHvTXVONXvZoqloHOaB7unOs8R/sivIlqjgmzyQJCZsojQkcFot/HZAfK6LFw4jPyzGev2+ou0DUZA0tHsEuSqAiC+PdnjIPpcpZOvG5KzFHCUCgYEAuLEUmIzQ7ex85Ulag2qfGj0CDMAq1R/rmwrk+1d2aP9GY890HwcyN5dlZGy8/Z/lMlzOGo1kDhhhwOfbiYSit00FdLChVux0wh8nyqqB4IuTy0S0ZeTNjWnjftpNaPXdHh5mpUXXKygCp3UT65HC6coaqoD3Vv8jE32svsz/uPE="
-    timestamp-authentication:
-      url: http://103.36.136.173:7845/services/TimeStampServices
-      app-code: ywxt
-      app-pwd: 12345678
-    HBoard-sign:
-      api-key: "00000"
-      api-secret: "00000000"
-      url: http://47.100.199.230:8080/pdfsign_hw
-      return-url: "https://emr.hnthyy.cn:9222/caTest/casign/hBoardSignReturnUrl"
-  apiurl:
-    socket-api: http://demo.hnthyy.cn:20922/thyy/api/socket
-    scheduled-api: http://172.16.32.133:21702/thyy/scheduled/api
-    thirdpart-api: http://172.16.32.160:21701/thyy/thirdpart/api
-    emr-editor-template-url: "http://webhis.thyy.cn:9281/"
-  #    drg-web-api:
-  archive:
-    archive-url: "http://localhost:20921/thyy/api/archive"
-    emr-archive-url: "http://webhis.thyy.cn:8080/thyyemrpdfserver/emr/archive/pdf"
-    path: "D:\\archive"
-  jcptmobile:
-    address: "https://emr.hnthyy.cn:8081"
-    agentid: 1000051
   system:
     yz-config:
+      yz-allow-invalidation: true
       exceeding-discharge-days: 4
+      prescribe-medical-advice-after-discharge: true
       ignore-dis-order-role: 85
-      shoushubingqu: "8000130"
-    emr-zy-dept-code: "3020000"
-    medinsur-dept: "3020100"
+    rational-use-url:
+    doctor-sign-folder: "D:\\a.snapshot\\resource\\doctorSignature"
+    emr-zy-dept-code: zhuyuan001
+    institution-name: "沭阳铭和医院"
+    institution-id: "H32132200561"
+    institution-area: "321322"
+  archive:
+    path: "D:\\a.snapshot\\resource\\archive"
+    archive-url: http://130.150.161.72:20921/thyy/api/archive
+  apiurl:
+    socket-api: http://130.150.161.72:20922/thyy/api/socket
+    scheduled-api: http://130.150.161.72:21702/thyy/scheduled/api
+    tirdpart-api: http://130.150.161.72:21701/thyy/thirdpart/api
+
+  jcptmobile:
+    address:
+    agentid:
+    url:
+    appid:
+    public-key: "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCDN7dqjx3C71g7P6qlcMHsnxawNSdgx7C0nHreDzAk0GFUO2xAkhxrYT9P2KQTPWzFQOje/DaxhWhJHssRQc8Q9lnaDZXta3wZvIvkLhW/NfJQNMLpOhYS6wyfTHrppSw/52TcxttmzmAEsza2ekkZbSvTwyVU4rIpKHyYt9r7bQIDAQAB"
   we-com:
     wply:
   medinsur:
-    api-url: http://webhis.thyy.cn:8077/ybjkdz
+    api-url: http://130.150.161.72:8079/ybjkdz
     api-version: 1.0.0
-    access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-    secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-    ip-address: 218.104.151.243
-    mac-address: FE-FC-FE-35-35-DE
-    hosp-id: H43010500370
-    hosp-name: 长沙泰和医院
-    hosp-area: 430105
-    soft-developer:
-    api-name:
+    api-name: hssServives
+    access-key: a94971b5ecee4bb994bce25c9291ccbf
+    secret-key: 3ni3n+nWhGCsiu6SITGUqNfzvx8=
+    ip-address: 130.150.161.72
+    mac-address: 00-50-56-B1-A5-29
+    hosp-id: H32132200561
+    hosp-name: 沭阳铭和医院
+    hosp-area: 321322
+    hosp-level: 02
+    soft-developer: 淮海科技