Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/controller/medicalinsurance/MarkMtFeesController.java

@@ -102,12 +102,13 @@ public class MarkMtFeesController {
             return map;
         }
         FundDetail fund = result.getData();
-        Map<String, String> payInfo = new HashMap<>();
+        Map<String, Object> payInfo = new HashMap<>();
         payInfo.put("totalCost", fund.getTotalCost());
         payInfo.put("fundPay", fund.getFundPay());
         payInfo.put("cashPay", fund.getCashPay());
         payInfo.put("acctPay", fund.getAcctPay());
         payInfo.put("selfPay", fund.getSelfPay());
+        payInfo.put("cardType", fund.getCardType());
         map.put("code", 0);
         map.put("msg", "成功。");
         map.put("payInfo", payInfo);

src/main/java/thyyxxk/webserver/controller/socketmessage/SocketMessageController.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.controller.socketmessage;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.socketmessage.MessageIndex;
 import thyyxxk.webserver.entity.socketmessage.SocketMessage;
@@ -26,6 +27,7 @@ public class SocketMessageController {
         return service.selectSystemMessages(date);
     }
 
+    @PassToken
     @PostMapping("/onPageRefresh")
     public ResultVo<Map<String, Object>> onPageRefresh(@RequestBody List<String> exclude) {
         return service.onPageRefresh(exclude);

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setlinfo/FundDetail.java

@@ -14,4 +14,6 @@ public class FundDetail {
     private String acctPay;
     private String cashPay;
     private String selfPay;
+    // 1-市医保，2-省医保,3-异地
+    private Integer cardType;
 }

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

@@ -136,8 +136,9 @@ public class ExecService {
     public JSONObject executeTrade(JSONObject input, SiFunction function) {
         RestTemplate template = new RestTemplate();
         try {
-            return template.postForObject(siApiUrl,
-                    new HttpEntity<>(input, SiUtil.getHttpHeaders(function)), JSONObject.class);
+            String result = template.postForObject(siApiUrl,
+                    new HttpEntity<>(input, SiUtil.getHttpHeaders(function)), String.class);
+            return JSONObject.parseObject(result);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("医保网络出错", e);

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

@@ -393,6 +393,7 @@ public class SiMzService {
         }
         psninfo.setInsutype(Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES.getCode());
         int count = dao.selectSiMzInfoCount(mzptnt.getPatNo(), mzptnt.getTimes());
+        insuInfo.setBalc("578.23");
         if (count == 0) {
             psninfo.setInsuplc(insuInfo.getInsuplcAdmdvs());
             psninfo.setPsnType(insuInfo.getPsnType());