门诊挂号增加挂号渠道和支付方式

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

@@ -715,7 +715,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);
@@ -733,6 +733,12 @@ public class ExcelUtil {
                 } else if (mzyReqrec.getCancelMark() == 1) {
                     status = "退号";
                 }
+                String opId="院内窗口";
+                if(Constants.BRZZJF_CODE.equals(mzyReqrec.getOpId())){
+                    opId="公众号";
+                }else  if(Constants.HLWYY_CODE.equals(mzyReqrec.getOpId())){
+                    opId="互联网医院平台";
+                }
                 String[] temp = {mzyReqrec.getName(),
                         mzyReqrecVo.getMzPatientMi().getIcCardNo(),
                         mzyReqrec.getPatientId(),
@@ -744,6 +750,8 @@ public class ExcelUtil {
                         mzyReqrec.getReqFee() == null ? "0" : mzyReqrec.getReqFee().toString(),
                         mzyReqrec.getClinicFee() == null ? "0" : mzyReqrec.getClinicFee().toString(),
                         mzyReqrec.getOthFee() == null ? "0" : mzyReqrec.getOthFee().toString(), status,
+                        opId,
+                        mzyReqrec.getPaymode(),
                         mzyReqrecVo.getMzPatientMi().getSocialNo() == null ? "" : mzyReqrecVo.getMzPatientMi().getSocialNo(),
                         mzyReqrecVo.getMzPatientMi().getPhoneNo() == null ? "" : mzyReqrecVo.getMzPatientMi().getPhoneNo(),
                         mzyReqrecVo.getMzPatientMi().getAddress() == null ? "" : mzyReqrecVo.getMzPatientMi().getAddress()

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -1991,6 +1991,11 @@ public class MedicalViewApiController {
             mzyReqrec.setChargeType(mzyRequest.getChargeType());
             mzyReqrec.setDoctorCode(mzyRequest.getDoctorCode());
             mzyReqrec.setRequestDay(mzyRequest.getRequestDay());
+            if (WX.equals(mzyReqrec.getPaymode())) {
+                mzyReqrec.setPaymode(Constants.ZZWX);
+            } else {
+                mzyReqrec.setPaymode(Constants.ZZZFB);
+            }
             MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
             if (mzZdWorkTime == null) {
                 resultMap.put("resultCode", -1);

src/main/resources/static/js/mz/registration_list.js

@@ -1277,6 +1277,26 @@ function loadTableList() {
                     formatter: function (value, row, index) {
                         return format(value, "yyyy-MM-dd HH:mm:ss");
                     }
+                }, {
+                    field: 'mzyReqrec.opId',
+                    title: '挂号渠道',
+                    align: "center",
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        if(value=='99999'){
+                            return '公众号';
+                        }
+                        if(value=='99996'){
+                            return '互联网医院平台';
+                        }
+                        return '院内窗口';
+                    }
+                }, {
+                    field: 'mzyReqrec.paymode',
+                    title: '支付方式',
+                    align: "center",
+                    valign: 'middle'
+                    // sortable: true,
                 }, {
                     title: '操作',
                     align: "center",