优化病案质控

src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetMainService.java

@@ -797,7 +797,10 @@ public class CaseFrontSheetMainService {
         String url = "http://172.16.32.126:8080/drg_web/drgGroupThird/V2/groupAndQuality.action";
         RestTemplate template = new RestTemplate();
         String result = template.postForObject(url, jsonParams, String.class);
-        log.info("病案质控：\n参数：{}\n结果：{}", jsonParams, result);
-        return ResultVoUtil.success("http://172.16.32.126:8080" + result);
+        result = "http://172.16.32.126:8080" + result;
+        String url2 = "http://172.16.32.126:8080/drg_web/drgGroupThird/V2/drgGroupAndQuality.action";
+        String result2 = template.postForObject(url2, jsonParams, String.class);
+        log.info("病案质控：\n参数：{}\n结果：{}", jsonParams, result2);
+        return ResultVoUtil.success(result);
     }
 }

src/main/java/thyyxxk/webserver/utils/FrontSheetUtil.java

@@ -20,6 +20,8 @@ public class FrontSheetUtil {
         baseInfo.setHospitalName("长沙泰和医院");
         baseInfo.setCardNumber(sheet.getSocialNo().toUpperCase());
         baseInfo.setPatientNo(sheet.getBah() + "_" + sheet.getAdmissTimes());
+        baseInfo.setVisitId(sheet.getBah() + "_" + sheet.getAdmissTimes() + "_1");
+        baseInfo.setAdmNo(sheet.getBah());
         baseInfo.setHsptzdCount(sheet.getAdmissTimes());
         baseInfo.setAge(sheet.getAge());
         baseInfo.setName(sheet.getName());
@@ -95,7 +97,10 @@ public class FrontSheetUtil {
         baseInfo.setTreaOprtFee(sheet.getSurgeryFee());
         baseInfo.setRecFee(sheet.getRecoverFee());
         baseInfo.setTradiMeditreaFee(sheet.getTcmTreatmentFee());
-        baseInfo.setWesternAntbosFee(sheet.getWestMedicineFee());
+        baseInfo.setWestDrugFee(sheet.getWestMedicineFee());
+        baseInfo.setChDrugFee(DecimalUtil.add(sheet.getChinesePatentMedicineFee(), sheet.getChineseHerbalMedicineFee()));
+        baseInfo.setChPatentFee(sheet.getChinesePatentMedicineFee());
+        baseInfo.setChHerbalFee(sheet.getChineseHerbalMedicineFee());
         baseInfo.setBlooBloodFee(sheet.getBloodFee());
         baseInfo.setBlooAlbuminFee(sheet.getAlbuminProductsFee());
         baseInfo.setBlooGlobulinFee(sheet.getGlobulinProductsFee());
@@ -107,6 +112,8 @@ public class FrontSheetUtil {
         baseInfo.setIsagainHsptzdId(sheet.getAdmissAgainInOneMonth());
         baseInfo.setIsagainHsptzd(filterAdmissAgainName(sheet.getAdmissAgainInOneMonth()));
         baseInfo.setAgainAim(sheet.getAdmissAgainPurpose());
+        baseInfo.setInjuPoisExterRsnCode(sheet.getHurtReasonCode());
+        baseInfo.setInjuPoisExterRsn(sheet.getHurtReasonName());
         return baseInfo;
     }