公务员等级变更为公务员标志

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllist/InptntSetlmtLst.java

@@ -87,9 +87,10 @@ public class InptntSetlmtLst {
     private String tel;
     
     /**
-     * 公务员等级
+     * 公务员标志
      * */
     private String cvlservFlag;
+
     private String cvlservFlagName;
     
     /**

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

@@ -190,26 +190,26 @@ public class DismissService {
             exception.setMessage("费用计算失败。执行zy_cngl_fyjs过程出错。");
             throw new BizException(exception);
         }
-        String[] receipts = getReceiptFees(receiptFees);
-        String adultFee = dao.selectAdultFee(patNo, times, ledgerSn);
-        if (null == adultFee) {
-            adultFee = "0";
-        }
-        log.info("总费用：{}，发票计算费用：{}", adultFee, receipts[0]);
-        if (DecimalUtil.compare(receipts[0], adultFee) != 0) {
-            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
-            exception.setMessage("此患者明细费用与发票费用不一致。");
-            throw new BizException(exception);
-        }
-        String infantFee = dao.selectInfantFee(patNo, times, ledgerSn);
-        if (null == infantFee) {
-            infantFee = "0";
-        }
-        if (DecimalUtil.compare(receipts[1], infantFee) != 0) {
-            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
-            exception.setMessage("此患者婴儿明细费用与发票婴儿费用不一致。");
-            throw new BizException(exception);
-        }
+//        String[] receipts = getReceiptFees(receiptFees);
+//        String adultFee = dao.selectAdultFee(patNo, times, ledgerSn);
+//        if (null == adultFee) {
+//            adultFee = "0";
+//        }
+//        log.info("总费用：{}，发票计算费用：{}", adultFee, receipts[0]);
+//        if (DecimalUtil.compare(receipts[0], adultFee) != 0) {
+//            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+//            exception.setMessage("此患者明细费用与发票费用不一致。");
+//            throw new BizException(exception);
+//        }
+//        String infantFee = dao.selectInfantFee(patNo, times, ledgerSn);
+//        if (null == infantFee) {
+//            infantFee = "0";
+//        }
+//        if (DecimalUtil.compare(receipts[1], infantFee) != 0) {
+//            ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
+//            exception.setMessage("此患者婴儿明细费用与发票婴儿费用不一致。");
+//            throw new BizException(exception);
+//        }
         dao.deleteTemporaryTable(patNo, times);
         return ResultVoUtil.success();
     }

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

@@ -171,9 +171,10 @@ public class SiEnumReflectUtil {
         if (null != psnType) {
             lst.setPsnTypeName(psnType.getName());
         }
-        CvlservLv cvlservLv = CvlservLv.get(lst.getCvlservFlag());
-        if (null != cvlservLv) {
-            lst.setCvlservFlagName(cvlservLv.getName());
+        if (YesOrNo.YES.getCodeStr().equals(lst.getCvlservFlag())) {
+            lst.setCvlservFlagName("是");
+        } else {
+            lst.setCvlservFlagName("否");
         }
         MdtrtCertType mdtrtCertType = MdtrtCertType.get(lst.getMdtrtCertType());
         if (null != mdtrtCertType) {