Merge branch 'dev-1.0.9' into dev-1.1.0

src/main/java/cn/hnthyy/thmz/controller/MzReceiptSerialController.java

@@ -215,61 +215,61 @@ public class MzReceiptSerialController {
         mzReceiptSerialVo.setMzReceiptSerial(mzReceiptSerial);
         List<String> feeList = new ArrayList<>();
         if (mzReceiptSerial.getCharge1() != null && mzReceiptSerial.getCharge1().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("挂号费:" + mzReceiptSerial.getCharge1().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("挂号:" + mzReceiptSerial.getCharge1().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge2() != null && mzReceiptSerial.getCharge2().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("床位费:" + mzReceiptSerial.getCharge2().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("床位:" + mzReceiptSerial.getCharge2().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge3() != null && mzReceiptSerial.getCharge3().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("诊察费:" + mzReceiptSerial.getCharge3().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("诊察:" + mzReceiptSerial.getCharge3().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge4() != null && mzReceiptSerial.getCharge4().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("检查费:" + mzReceiptSerial.getCharge4().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("检查:" + mzReceiptSerial.getCharge4().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge5() != null && mzReceiptSerial.getCharge5().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("治疗费:" + mzReceiptSerial.getCharge5().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("治疗:" + mzReceiptSerial.getCharge5().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge6() != null && mzReceiptSerial.getCharge6().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("护理费:" + mzReceiptSerial.getCharge6().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("护理:" + mzReceiptSerial.getCharge6().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge7() != null && mzReceiptSerial.getCharge7().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("手术费:" + mzReceiptSerial.getCharge7().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("手术:" + mzReceiptSerial.getCharge7().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge8() != null && mzReceiptSerial.getCharge8().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("化验费:" + mzReceiptSerial.getCharge8().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("化验:" + mzReceiptSerial.getCharge8().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge9() != null && mzReceiptSerial.getCharge9().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("其他费用:" + mzReceiptSerial.getCharge9().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("其他:" + mzReceiptSerial.getCharge9().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge10() != null && mzReceiptSerial.getCharge10().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("西药费:" + mzReceiptSerial.getCharge10().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("西药:" + mzReceiptSerial.getCharge10().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge11() != null && mzReceiptSerial.getCharge11().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("中成药费:" + mzReceiptSerial.getCharge11().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("成药:" + mzReceiptSerial.getCharge11().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge12() != null && mzReceiptSerial.getCharge12().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("中草药费:" + mzReceiptSerial.getCharge12().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("草药:" + mzReceiptSerial.getCharge12().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge13() != null && mzReceiptSerial.getCharge13().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("特材费:" + mzReceiptSerial.getCharge13().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("特材:" + mzReceiptSerial.getCharge13().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge14() != null && mzReceiptSerial.getCharge14().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("输血费:" + mzReceiptSerial.getCharge14().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("输血:" + mzReceiptSerial.getCharge14().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge15() != null && mzReceiptSerial.getCharge15().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("鉴定费:" + mzReceiptSerial.getCharge15().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("鉴定:" + mzReceiptSerial.getCharge15().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge16() != null && mzReceiptSerial.getCharge16().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("消毒费:" + mzReceiptSerial.getCharge16().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("消毒:" + mzReceiptSerial.getCharge16().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge17() != null && mzReceiptSerial.getCharge17().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("器械费:" + mzReceiptSerial.getCharge17().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("器械:" + mzReceiptSerial.getCharge17().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge18() != null && mzReceiptSerial.getCharge18().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("材料费:" + mzReceiptSerial.getCharge18().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("材料:" + mzReceiptSerial.getCharge18().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge19() != null && mzReceiptSerial.getCharge19().compareTo(BigDecimal.ZERO) == 1) {
-            feeList.add("麻醉费:" + mzReceiptSerial.getCharge19().setScale(1, BigDecimal.ROUND_FLOOR));
+            feeList.add("麻醉:" + mzReceiptSerial.getCharge19().setScale(1, BigDecimal.ROUND_FLOOR));
         }
         if (mzReceiptSerial.getCharge20() != null && mzReceiptSerial.getCharge20().compareTo(BigDecimal.ZERO) == 1) {
             feeList.add("四舍五入:" + mzReceiptSerial.getCharge20().setScale(1, BigDecimal.ROUND_FLOOR));