增加挂号列表付款方式列

src/main/java/cn/hnthyy/thmz/Utils/ExcelUtil.java

@@ -370,7 +370,7 @@ public class ExcelUtil {
         data.put(FILE_NAME_KEY, "挂号清单.xls");
         List<Map<String,Object>> heads =new ArrayList<>();
         Map<String,Object> map0 = new HashMap<>();
-        String[] head0 = {"收据号","机制号","病人ID","病人姓名","科别","号别","状态","金额","挂号日期"};
+        String[] head0 = {"收据号","机制号","病人ID","病人姓名","科别","号别","状态","金额","付款方式","挂号日期"};
         String[] headNum0 = {"0,0,0,0"};
         map0.put(HEAD_ARR_KEY,head0);
         map0.put(HEAD_NUM_KEY,headNum0);
@@ -387,6 +387,7 @@ public class ExcelUtil {
                         reqrecVo.getChargeType(),
                         reqrecVo.getCancelMark(),
                         reqrecVo.getChargeFee().setScale(2, BigDecimal.ROUND_HALF_UP).toString(),
+                        reqrecVo.getPaymode(),
                         DateFormatUtils.format(reqrecVo.getOpDay(), "yyyy-MM-dd HH:mm:ss")
                 };
                 arr.add(temp);

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

@@ -251,6 +251,8 @@ public class ChargeFeeVoController {
                     }
                 }
             }
+            List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+            Map<String, String> chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
             for (ReqrecVo ro : reqrecVos) {
                 ro.setUnitCode(zdUnitCodeService.queryDeptNameByIdInCache(ro.getUnitCode()));
                 ro.setChargeType(chargeTypeMap.get(ro.getChargeType()));
@@ -258,6 +260,15 @@ public class ChargeFeeVoController {
                 if (YesNoEnum.YES.equals(fitEmpName)) {
                     ro.setOpId(employeeMap.get(ro.getOpId()));
                 }
+
+                if (Constants.BRZZJF_CODE.equalsIgnoreCase(ro.getOpId())) {
+                    if (Constants.WX.equalsIgnoreCase(ro.getPaymode()) || Constants.BYJZ.equalsIgnoreCase(ro.getPaymode())) {
+                        ro.setPaymode(Constants.ZZWX);
+                    } else if (Constants.ZFB.equalsIgnoreCase(ro.getPaymode())) {
+                        ro.setPaymode(Constants.ZZZFB);
+                    }
+                }
+                ro.setPaymode(chequeTypeMap.get(ro.getPaymode()));
             }
         }
     }

src/main/java/cn/hnthyy/thmz/mapper/his/ChargeFeeVoMapper.java

@@ -147,7 +147,8 @@ public interface ChargeFeeVoMapper {
             "         mzy_reqrec.charge_type," +
             "         mzy_reqrec.cancel_mark," +
             "         sum(req_fee + clinic_fee + oth_fee + isnull(brochure_fee,0) + isnull(bl_fee,0) + isnull(ck_fee,0)) charge_fee," +
-            "         max(mzy_reqrec.op_day) op_day " +
+            "         max(mzy_reqrec.op_day) op_day, " +
+            "         paymode=mzy_reqrec.paymode "+
             "    FROM mzy_reqrec   " +
             "   WHERE (op_id = #{userIdCode} ) and dcount_no = 0 " +
             "group by receipt_bill," +
@@ -156,7 +157,7 @@ public interface ChargeFeeVoMapper {
             "         name," +
             "   mzy_reqrec.unit_code,   " +
             "         mzy_reqrec.charge_type," +
-            "         mzy_reqrec.cancel_mark " +
+            "         mzy_reqrec.cancel_mark,mzy_reqrec.paymode " +
             " order by receipt_bill")
     List<ReqrecVo> selectReqrecVoUnAccount(@Param("userIdCode") String userIdCode);
 
@@ -176,7 +177,8 @@ public interface ChargeFeeVoMapper {
             "         charge_type=mzy_reqrec.charge_type," +
             "         cancel_mark=mzy_reqrec.cancel_mark," +
             "         charge_fee =sum(req_fee + clinic_fee + oth_fee + isnull(brochure_fee,0) + isnull(bl_fee,0) + isnull(ck_fee,0))," +
-            "         op_day =max(mzy_reqrec.op_day) " +
+            "         op_day =max(mzy_reqrec.op_day), " +
+            "         paymode=mzy_reqrec.paymode "+
             "    FROM mzy_reqrec " +
             "   WHERE   case when '1'=#{caseType} then 0 else 1 end = dcount_no and " +
             "         case when '1'=#{caseType} then op_day else closing_date end=#{dcountDate,jdbcType=TIMESTAMP} and " +
@@ -187,7 +189,7 @@ public interface ChargeFeeVoMapper {
             "         name," +
             "   mzy_reqrec.unit_code,   " +
             "         mzy_reqrec.charge_type," +
-            "         mzy_reqrec.cancel_mark " +
+            "         mzy_reqrec.cancel_mark,mzy_reqrec.paymode " +
             " order by receipt_bill")
     List<ReqrecVo> selectReqrecVoReprint(@Param("userIdCode") String userIdCode, @Param("caseType") String caseType, @Param("dcountDate") Date dcountDate);
 
@@ -208,7 +210,8 @@ public interface ChargeFeeVoMapper {
             "         cancel_mark=mzy_reqrec.cancel_mark," +
             "         charge_fee =sum(req_fee + clinic_fee + oth_fee + isnull(brochure_fee,0) + isnull(bl_fee,0) + isnull(ck_fee,0))," +
             "         op_day =max(mzy_reqrec.op_day)," +
-            "op_id " +
+            "op_id, " +
+            "         paymode=mzy_reqrec.paymode "+
             "    FROM mzy_reqrec " +
             "   WHERE case when '1'=#{caseType} then 0 else 1 end = dcount_no and " +
             "         case when '1'=#{caseType} then op_day else closing_date end >=#{beginDate,jdbcType=TIMESTAMP} and " +
@@ -220,7 +223,7 @@ public interface ChargeFeeVoMapper {
             "mzy_reqrec.unit_code," +
             "         mzy_reqrec.charge_type," +
             "         mzy_reqrec.cancel_mark," +
-            " op_id " +
+            " op_id,mzy_reqrec.paymode " +
             " order by receipt_bill")
     List<ReqrecVo> selectReqrecVoCollect(@Param("caseType") String caseType, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
@@ -243,6 +246,7 @@ public interface ChargeFeeVoMapper {
             "         charge_fee =sum(req_fee + clinic_fee + oth_fee + isnull(brochure_fee,0) + isnull(bl_fee,0) + isnull(ck_fee,0))," +
             "         op_day =max(mzy_reqrec_b.op_day)," +
             "op_id " +
+            "         paymode=mzy_reqrec_b.paymode "+
             "    FROM mzy_reqrec_b " +
             "   WHERE case when '1'=#{caseType} then 0 else 1 end = dcount_no and " +
             "         case when '1'=#{caseType} then op_day else closing_date end >=#{beginDate,jdbcType=TIMESTAMP} and " +
@@ -254,7 +258,7 @@ public interface ChargeFeeVoMapper {
             "mzy_reqrec_b.unit_code," +
             "         mzy_reqrec_b.charge_type," +
             "         mzy_reqrec_b.cancel_mark," +
-            " op_id " +
+            " op_id,mzy_reqrec_b.paymode " +
             " order by receipt_bill")
     List<ReqrecVo> selectHisReqrecVoCollect(@Param("caseType") String caseType, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
@@ -687,7 +691,7 @@ public interface ChargeFeeVoMapper {
             "SELECT " +
                     "receipt_bill= rtrim(mzy_reqrec.receipt_bill)," +
                     "         rtrim(mzy_reqrec.name) name," +
-                    "         ABS(mzy_reqrec.req_fee)+ABS(mzy_reqrec.oth_fee)+ABS(mzy_reqrec.clinic_fee)  as total_charge " +
+                    "         mzy_reqrec.req_fee+mzy_reqrec.oth_fee+mzy_reqrec.clinic_fee  as total_charge " +
                     "FROM mzy_reqrec " +
                     "where cancel_mark <![CDATA[<>]]> '0'  and times <![CDATA[<]]> 0 " +
                     "<when test='userIdCode!=null'>",

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

@@ -153,6 +153,9 @@ public class ReqrecVo {
     private BigDecimal ghjebhjz;
     //本院记账大写
     private String byjzssdx;
+    //付款方式
+    private String paymode;
+
     public BigDecimal getHjss() {
         if(hjss==null){
             hjss=BigDecimal.ZERO;

src/main/resources/static/js/daily.js

@@ -575,6 +575,11 @@ function getGhqd() {
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
                 }
+            }, {
+                field: 'paymode',
+                title: '付款方式',
+                align: "center",
+                valign: 'middle'
             }, {
                 field: 'opDay',
                 title: '挂号日期',

src/main/resources/static/js/daily_collect.js

@@ -573,6 +573,11 @@ function getGhqd() {
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
                 }
+            }, {
+                field: 'paymode',
+                title: '付款方式',
+                align: "center",
+                valign: 'middle'
             }, {
                 field: 'opId',
                 title: '收费员',

src/main/resources/static/js/daily_repeat_print.js

@@ -597,6 +597,11 @@ function getGhqd() {
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
                 }
+            }, {
+                field: 'paymode',
+                title: '付款方式',
+                align: "center",
+                valign: 'middle'
             }, {
                 field: 'opDay',
                 title: '挂号日期',