金额优化

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -1080,7 +1080,7 @@ public class MzChargeDetailController {
                         map.put("parent", zyZdAuditItem.getParentCode());
                         map.put("audit_code", zyZdAuditItem.getName());
                     } else {
-                        log.info("");
+                        log.info(" 没有父类型{},{}",auditCode);
                     }
                     map.put("exec_dept", zdUnitCodeService.queryDeptNameByIdInCache((String) map.get("exec_dept")));
                     fomartData(mzBillItemMap, parentList, depetList, depetSet, parentMap, map);

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzReceiptSerial.java

@@ -20,7 +20,7 @@ public class MzReceiptSerial implements Serializable {
     private Integer receiptNo;
     //交费流水号 (机制号)
     private Integer serialNo;
-    //操作员
+    //操作员   打印发票的人
     private String operatorId;
     //挂号费
     private BigDecimal charge1;

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPatientMiMapper.java

@@ -16,7 +16,7 @@ public interface MzPatientMiMapper {
      */
     @Select("select rtrim(social_no) social_no,rtrim(hic_no) hic_no,rtrim(name) name,rtrim(sex) sex,lv_date,rtrim(patient_id) patient_id,rtrim(p_bar_code) p_bar_code," +
             "rtrim(baddebt_mark) baddebt_mark,rtrim(response_type) response_type,rtrim(charge_type) charge_type,times,rtrim(reqdel_mark) reqdel_mark,age,birth_day," +
-            "rtrim(ic_card_no) ic_card_no,rtrim(phone_no) phone_no,rtrim(adress) address,rtrim(yb_card_no) yb_card_no,first_date,rtrim(rel_name) rel_name,rtrim(contract_name) contract_name from mz_patient_mi  where  ic_card_no =#{icCardNo} or patient_id=#{icCardNo} or patient_id=#{icCardNo}")
+            "rtrim(ic_card_no) ic_card_no,rtrim(phone_no) phone_no,rtrim(adress) address,rtrim(yb_card_no) yb_card_no,first_date,rtrim(rel_name) rel_name,rtrim(contract_name) contract_name from mz_patient_mi  where  ic_card_no =#{icCardNo} or patient_id=#{icCardNo}")
     MzPatientMi selectByIcCardNo(@Param("icCardNo") String icCardNo);
 
 

src/main/java/cn/hnthyy/thmz/vo/ChargeCountVo.java

@@ -118,7 +118,7 @@ public class ChargeCountVo {
     //微信自助退费笔数
     private Integer wxzztfbs;
     //微信自助退费
-    private Integer wxzztf;
+    private BigDecimal wxzztf;
     //微信自助实收笔数
     private Integer wxzzssbs;
     //支付宝自助实收