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

src/main/java/thyyxxk/webserver/service/inpatient/DismissService.java

@@ -210,7 +210,7 @@ public class DismissService {
             throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, dischargeErrorMessage(unreceivedDrug));
         }
         if (dao.hasUnreceivedFees(patNo, times, tmpendtime) > 0) {
-            throw new BizException(ExceptionEnum.LOGICAL_ERROR, "此患者有未接收的费用。");
+            throw new BizException(ExceptionEnum.LOGICAL_ERROR, "此患者有未接收的费用，请联系医技科室确认或取消。");
         }
         if (dao.hasUnSubmitDrugList(patNo, times) > 0) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "此患者有未提交的药单。");

src/main/java/thyyxxk/webserver/service/inpatient/xmlr/XiangMuLuRuService.java

@@ -527,9 +527,7 @@ public class XiangMuLuRuService {
                 BeanUtils.copyProperties(zyDetailCharge, shenQing);
                 shenQing.setChargeFee(zyDetailCharge.getChargeAmount());
                 shenQing.setChargeAmount((zyDetailCharge.getAmount()));
-                if (StrUtil.isBlank(shenQing.getGroupNo())) {
-                    shenQing.setGroupNo("73");
-                }
+                shenQing.setGroupNo("73");
                 yaoPingShenQingDan.add(shenQing);
             }
             if (zyDetailCharge.getSelfFlag() == null) {