Merge branch 'dev-1.0.7' into dev-1.0.9

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

@@ -1,8 +1,10 @@
 package cn.hnthyy.thmz.Utils;
 
+import cn.hnthyy.thmz.entity.his.MzyReqrec;
 import cn.hnthyy.thmz.entity.his.ZdUnitCode;
 import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.vo.ChargeFeeVo;
+import cn.hnthyy.thmz.vo.MzyReqrecVo;
 import cn.hnthyy.thmz.vo.ReqrecVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -88,6 +90,20 @@ public class ExcelUtil {
         exportExcel(request, response, data, YP_REPORT_COLUMNS_LENGTH,VERSION_2007);
     }
 
+    /**
+     * 将挂号列表对象转换为导出Excel
+     *
+     * @param request
+     * @param response
+     * @param mzyReqrecList
+     */
+    public static void exportExcelForReqrecList(HttpServletRequest request, HttpServletResponse response, List<MzyReqrecVo> mzyReqrecList) {
+        Map<String, Object> data = fomartReqrecList(mzyReqrecList);
+        exportExcel(request, response, data, YP_REPORT_COLUMNS_LENGTH,VERSION_2007);
+    }
+
+
+
     /**
      * 方法名：exportExcel
      * 功能：导出Excel
@@ -437,7 +453,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);
@@ -449,8 +465,10 @@ public class ExcelUtil {
                 Double quty = (Double) thmzmxsr.get("quty");
                 BigDecimal price = (BigDecimal) thmzmxsr.get("price");
                 Double je = (Double) thmzmxsr.get("je");
+                Date chargeDate= (Date) thmzmxsr.get("charge_date");
                 String[] temp = {(String) thmzmxsr.get("xm"),
                         (String) thmzmxsr.get("patient_id"),
+                        DateFormatUtils.format(chargeDate, "yyyy-MM-dd HH:mm:ss"),
                         (String) thmzmxsr.get("jz_sq_dept"),
                         (String) thmzmxsr.get("jz_sq_doctor"),
                         (String) thmzmxsr.get("exec_dept"),
@@ -468,4 +486,54 @@ public class ExcelUtil {
         return data;
     }
 
+
+    /**
+     * 将门诊挂号列表对象转换为导出Excel  表格内容的格式
+     *
+     * @param mzyReqrecList
+     * @return
+     */
+    private static Map<String, Object> fomartReqrecList(List<MzyReqrecVo> mzyReqrecList) {
+        if (mzyReqrecList == null) {
+            return Collections.emptyMap();
+        }
+        Map<String, Object> data = new HashMap<>();
+        data.put(FILE_NAME_KEY, "门诊挂号统计.xls");
+        List<Map<String, Object>> heads = new ArrayList<>();
+        Map<String, Object> map0 = new HashMap<>();
+        String[] head0 = {"病人姓名", "诊疗卡号" ,"病人ID", "挂号科室", "挂号医生", "挂号时间", "挂号费", "诊查费", "其他收费","就诊状态"};
+        String[] headNum0 = {"0,0,0,0"};
+        map0.put(HEAD_ARR_KEY, head0);
+        map0.put(HEAD_NUM_KEY, headNum0);
+        heads.add(map0);
+        data.put(HEAD_KEY, heads);
+        List<String[]> arr = new ArrayList<>();
+        mzyReqrecList.forEach(mzyReqrecVo -> {
+            if (mzyReqrecVo != null) {
+                MzyReqrec mzyReqrec=mzyReqrecVo.getMzyReqrec();
+                String status = "挂号";
+                if(mzyReqrec.getCancelMark()==0){
+                    if(mzyReqrec.getVisitedMark()==1){
+                        status = "已诊";
+                    }
+                }else if (mzyReqrec.getCancelMark() == 1) {
+                    status = "退号";
+                }
+                String[] temp = {mzyReqrec.getName(),
+                        mzyReqrecVo.getMzPatientMi().getIcCardNo(),
+                        mzyReqrec.getPatientId(),
+                                mzyReqrec.getUnitCode(),
+                                mzyReqrec.getDoctorCode(),
+                                DateFormatUtils.format(mzyReqrec.getRequestDay(), "yyyy-MM-dd HH:mm:ss"),
+                                mzyReqrec.getReqFee()==null?"0":mzyReqrec.getReqFee().toString(),
+                                mzyReqrec.getClinicFee()==null?"0":mzyReqrec.getClinicFee().toString(),
+                                mzyReqrec.getOthFee()==null?"0":mzyReqrec.getOthFee().toString(),status
+                };
+                arr.add(temp);
+            }
+        });
+        data.put(DATA_KEY, arr);
+        return data;
+    }
+
 }

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

@@ -1,9 +1,6 @@
 package cn.hnthyy.thmz.controller;
 
-import cn.hnthyy.thmz.Utils.DateUtil;
-import cn.hnthyy.thmz.Utils.JsonUtil;
-import cn.hnthyy.thmz.Utils.NumberToCN;
-import cn.hnthyy.thmz.Utils.TokenUtil;
+import cn.hnthyy.thmz.Utils.*;
 import cn.hnthyy.thmz.comment.UserLoginToken;
 import cn.hnthyy.thmz.common.Constants;
 import cn.hnthyy.thmz.entity.MzException;
@@ -18,10 +15,12 @@ import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -176,6 +175,59 @@ public class MzyReqrecController {
     }
 
 
+    /**
+     * 导出挂号列表
+     * @return
+     */
+    @RequestMapping(value = "/exportListMzyReqrec", method = {RequestMethod.GET})
+    public Map<String, Object> exportListMzyReqrec(@RequestParam("name") String name,@RequestParam("unitCode") String unitCode,@RequestParam("doctorCode") String doctorCode,
+                                                   @RequestParam("phoneNo") String phoneNo,@RequestParam("serialNo") String serialNo, @RequestParam("beginTime") String beginTime,
+                                                   @RequestParam("endTime") String endTime , @RequestParam("visitedMark") String visitedMark, @RequestParam("cancelMark") String cancelMark, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            MzyReqrecPageDto mzyReqrecPageDto = new MzyReqrecPageDto();
+            mzyReqrecPageDto.setMzyReqrec(new MzyReqrec());
+            MzyReqrec mzyReqrec=mzyReqrecPageDto.getMzyReqrec();
+            mzyReqrec.setName(name);
+            mzyReqrec.setUnitCode(unitCode);
+            mzyReqrec.setDoctorCode(doctorCode);
+            mzyReqrec.setSerialNo(StringUtils.isBlank(serialNo)?null:Integer.valueOf(serialNo));
+            mzyReqrec.setVisitedMark(StringUtils.isBlank(visitedMark)?null:Integer.valueOf(visitedMark));
+            mzyReqrec.setCancelMark(StringUtils.isBlank(cancelMark)?null:Integer.valueOf(cancelMark));
+            mzyReqrecPageDto.setPhoneNo(phoneNo);
+            mzyReqrecPageDto.setBeginTime(DateUtil.pase(beginTime, "yyyy-MM-dd HH:mm:ss"));
+            mzyReqrecPageDto.setEndTime(DateUtil.pase(endTime, "yyyy-MM-dd HH:mm:ss"));
+            if(StringUtils.isBlank(mzyReqrec.getName())){
+                mzyReqrec.setName(null);
+            }else {
+                mzyReqrec.setName("%"+mzyReqrec.getName()+"%");
+            }
+            if(StringUtils.isBlank(mzyReqrec.getUnitCode())){
+                mzyReqrec.setUnitCode(null);
+            }
+            if(StringUtils.isBlank(mzyReqrec.getDoctorCode())){
+                mzyReqrec.setDoctorCode(null);
+            }
+            if(StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())){
+                List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
+                if(mzPatientMis==null || mzPatientMis.size()==0){
+                    return null;
+                }
+                List<String> patientIds = mzPatientMis.stream().filter(u -> StringUtils.isNotBlank(u.getPatientId())).map(u -> u.getPatientId()).collect(Collectors.toList());
+                mzyReqrecPageDto.setPatientIds(patientIds);
+            }
+            Integer count = mzyReqrecService.countMzyReqrec(mzyReqrecPageDto);
+            mzyReqrecPageDto.setPageSize(count);
+            ExcelUtil.exportExcelForReqrecList(request, response, getMzyReqrecVo(mzyReqrecService.queryMzyReqrecWithPage(mzyReqrecPageDto)));
+            return null;
+        }catch (Exception e){
+            log.error("导出挂号列表失败，系统异常，错误信息{}",e.getMessage());
+            return null;
+        }
+    }
+
+
+
+
     /**
      * 查询挂号列表
      * @return

src/main/java/cn/hnthyy/thmz/entity/his/MzyReqrec.java

@@ -52,7 +52,7 @@ public class MzyReqrec {
     private Integer visitedMark;
     //结帐日期
     private Date closingDate;
-    //打印人id
+    //发票打印人id
     private String printerId;
     //借用为全免标志:1:全免
     private String printFlag;
@@ -80,5 +80,8 @@ public class MzyReqrec {
     private String psordnum;
     //流水号
     private String agtordnum;
-
+    //发票结算状态 已结帐 1 是  0 否
+    private Integer printDcountNo;
+    //发票结帐日期
+    private Date printClosingDate;
 }

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

@@ -320,8 +320,8 @@ public interface ChargeFeeVoMapper {
             "        receipt_bill = rtrim(mzy_reqrec.receipt_bill)," +
             "         serial_no =mzy_reqrec.serial_no " +
             "    FROM mzy_reqrec " +
-            " where mzy_reqrec.op_id = #{userIdCode} and dcount_no=1 and times>0 and " +
-            "       closing_date =#{dcountDate} " +
+            " where mzy_reqrec.printer_id = #{userIdCode} and print_dcount_no=1 and times>0 and " +
+            "       print_closing_date =#{dcountDate} " +
             "order by op_id,mzy_reqrec.receipt_bill ")
     List<ReceiptBillVo> selectGhReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
@@ -570,19 +570,19 @@ public interface ChargeFeeVoMapper {
             " and times <![CDATA[>]]> 0 ",
             "</when>",
             "<when test='userIdCode!=null'>",
-            " and op_id=#{userIdCode} ",
+            " and printer_id=#{userIdCode} ",
             "</when>",
             "<when test='dcountDate!=null'>",
-            " and closing_date=#{dcountDate,jdbcType=TIMESTAMP} ",
+            " and print_closing_date=#{dcountDate,jdbcType=TIMESTAMP} ",
             "</when>",
             "<when test='beginDate!=null'>",
-            " and closing_date &gt;=#{beginDate,jdbcType=TIMESTAMP} ",
+            " and print_closing_date &gt;=#{beginDate,jdbcType=TIMESTAMP} ",
             "</when>",
             "<when test='endDate!=null'>",
-            " and closing_date &lt;=#{endDate,jdbcType=TIMESTAMP} ",
+            " and print_closing_date &lt;=#{endDate,jdbcType=TIMESTAMP} ",
             "</when>",
             "<when test='dcountDate == null and beginDate == null and endDate == null'>",
-            " and dcount_no =0 ",
+            " and print_dcount_no =0 ",
             "</when>",
             "</script>"})
     Integer countReqrecReceipt(@Param("userIdCode") String userIdCode, @Param("cancelMark") String cancelMark, @Param("dcountDate") Date dcountDate, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
@@ -780,7 +780,7 @@ public interface ChargeFeeVoMapper {
     int dcountDeposit(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
     /**
-     * 挂号表结算
+     * 挂号表收费结算
      *
      * @param userIdCode
      * @param dcountDate
@@ -789,6 +789,17 @@ public interface ChargeFeeVoMapper {
     @Update("update mzy_reqrec set dcount_no =1 , closing_date =#{dcountDate} where op_id =#{userIdCode} and dcount_no =0 ")
     int dcountReqrec(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
+
+    /**
+     * 挂号表打印发票结算
+     *
+     * @param userIdCode
+     * @param dcountDate
+     * @return
+     */
+    @Update("update mzy_reqrec set print_dcount_no =1 , print_closing_date =#{dcountDate} where printer_id =#{userIdCode} and print_dcount_no =0 ")
+    int dcountReqrecReceipt(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
+
     /**
      * 在发票表中查询当前日期范围内有收款记录的收费员
      *

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

@@ -16,13 +16,13 @@ import java.util.Map;
  */
 public interface MzyReqrecMapper {
     @Insert("INSERT INTO mzy_reqrec(patient_id,times,name,req_type,request_day,ampm,unit_code,group_code,doctor_code,charge_type,req_order,req_fee,oth_fee,cancel_mark,admiss_time,op_id," +
-            "op_day,clinic_fee,visited_mark,plus_mark,closing_date,printer_id,print_flag,windows_no,serial_no,receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,visit_doctor,visit_date,paymode,psordnum,agtordnum,bl_fee,ck_fee)" +
+            "op_day,clinic_fee,visited_mark,plus_mark,closing_date,printer_id,print_flag,windows_no,serial_no,receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,visit_doctor,visit_date,paymode,psordnum,agtordnum,bl_fee,ck_fee,print_closing_date,print_dcount_no)" +
             " VALUES (#{patientId,jdbcType=CHAR},#{times,jdbcType=INTEGER},#{name,jdbcType=CHAR},#{reqType,jdbcType=CHAR},#{requestDay,jdbcType=TIMESTAMP},#{ampm,jdbcType=CHAR}," +
             "#{unitCode,jdbcType=CHAR},#{groupCode,jdbcType=CHAR},#{doctorCode,jdbcType=CHAR},#{chargeType,jdbcType=CHAR},#{reqOrder,jdbcType=INTEGER},#{reqFee,jdbcType=DOUBLE}," +
             "#{othFee,jdbcType=DOUBLE},#{cancelMark,jdbcType=CHAR},#{admissTime,jdbcType=CHAR},#{opId,jdbcType=CHAR},#{opDay,jdbcType=TIMESTAMP},#{clinicFee,jdbcType=DOUBLE},#{visitedMark,jdbcType=CHAR},#{plusMark,jdbcType=CHAR}," +
             "#{closingDate,jdbcType=TIMESTAMP},#{printerId,jdbcType=CHAR},#{printFlag,jdbcType=CHAR},#{windowsNo,jdbcType=CHAR},#{serialNo,jdbcType=INTEGER},#{receiptBill,jdbcType=CHAR},#{dcountNo,jdbcType=INTEGER}," +
             "#{brochureFee,jdbcType=DOUBLE},#{deptNo,jdbcType=VARCHAR},#{visitDept,jdbcType=VARCHAR},#{visitDoctor,jdbcType=VARCHAR},#{visitDate,jdbcType=TIMESTAMP},#{paymode,jdbcType=VARCHAR}," +
-            "#{psordnum,jdbcType=VARCHAR},#{agtordnum,jdbcType=VARCHAR},0.00,0.00)")
+            "#{psordnum,jdbcType=VARCHAR},#{agtordnum,jdbcType=VARCHAR},0.00,0.00,#{printClosingDate,jdbcType=TIMESTAMP},#{printDcountNo,jdbcType=INTEGER})")
     int insertMzyReqrec(MzyReqrec mzyReqrec);
 
     /**
@@ -93,7 +93,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum   FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzy_reqrec_page.request_day desc) AS RowNumber,",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no   FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzy_reqrec_page.request_day desc) AS RowNumber,",
             "* from dbo.mzy_reqrec mzy_reqrec_page where times >0 ",
             "<when test='patientIds!=null'>",
             " and patient_id in ",
@@ -145,7 +145,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum   from dbo.mzy_reqrec where cancel_mark=1",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no   from dbo.mzy_reqrec where cancel_mark=1",
             "</script>"})
     List<MzyReqrec> selectAllCancel();
 
@@ -183,7 +183,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum   from dbo.mzy_reqrec where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER}",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no   from dbo.mzy_reqrec where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER}",
             "</script>"})
     MzyReqrec selectMzyReqrecByPatientIdAndTimes(@Param("patientId") String patientId, @Param("times") Integer times);
 
@@ -271,6 +271,6 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,"+
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,"+
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,"+
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum   from dbo.mzy_reqrec where psordnum=#{psordnum} and agtordnum = #{agtordnum}")
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no   from dbo.mzy_reqrec where psordnum=#{psordnum} and agtordnum = #{agtordnum}")
     MzyReqrec selectMzyReqrecByAgtordnum(@Param("psordnum") String psordnum,@Param("agtordnum") String agtordnum);
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/ChargeFeeVoServiceImpl.java

@@ -145,6 +145,7 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
         chargeFeeVoMapper.dcountReceiptChargeCount(userIdCode, dcountDate);
         chargeFeeVoMapper.dcountDeposit(userIdCode, dcountDate);
         chargeFeeVoMapper.dcountReqrec(userIdCode, dcountDate);
+        chargeFeeVoMapper.dcountReqrecReceipt(userIdCode, dcountDate);
         return dcountDate;
     }
 

src/main/resources/static/js/mzsrmx.js

@@ -200,6 +200,14 @@ function initMzsrmxTable() {
                 title: '病人ID',
                 align: "center",
                 valign: 'middle',
+            }, {
+                field: 'charge_date',
+                title: '缴费时间',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
             }, {
                 field: 'jz_sq_dept',
                 title: '就诊/申请科室',

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

@@ -236,6 +236,11 @@ $(function () {
     //     CreatePrinterList();
     //     $("#editPrintModal").modal();
     // });
+
+    //初始化页面上面的按钮事件
+    $("#btn_excel").click(function (t) {
+        exportExcel();
+    });
 });
 
 
@@ -2097,4 +2102,30 @@ function isEmpty(obj) {
     } else {
         return false;
     }
+}
+
+
+
+
+/**
+ * 导出excel
+ */
+function exportExcel() {
+    var rePortRangeArr = getRePortRangeArr();
+    var regiListBtnGroup = getIndex("regi_List_btn_group");
+    var visitedMark="";
+    var cancelMark="";
+    if (regiListBtnGroup == 1) {
+        visitedMark=0;
+        cancelMark=0;
+    }else if (regiListBtnGroup == 2) {
+        visitedMark=1;
+        cancelMark=0;
+    }else if (regiListBtnGroup == 3) {
+
+        cancelMark=1;
+    }
+    window.location.href = "/thmz/exportListMzyReqrec?beginTime=" + rePortRangeArr[0] + "&endTime=" + rePortRangeArr[1]+"&name="+$("#userNameParam").val()
+        +"&unitCode="+$("#deptNoParam").val()+"&doctorCode="+$("#doctorParam").val()+"&phoneNo="+$("#phoneParam").val()+"&serialNo="+$("#serialNoParams").val()+"&visitedMark="
+        +visitedMark+"&cancelMark="+cancelMark;
 }

src/main/resources/static/js/toll_administration.js

@@ -1134,6 +1134,15 @@ function initTallyDetailTable() {
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
                 }
+            },
+            {
+                field: 'chargeDate',
+                title: '记账时间',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
             }
         ],
         /**

src/main/resources/templates/registration_list.html

@@ -88,7 +88,7 @@
                             <!--<select class="form-control selectpicker show-tick" required="required" id="sourceParam">-->
                             <!--</select>-->
                         <!--</div>-->
-                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="reportrange">挂号时间
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="reportrange">时间
                         </label>
                         <div class="col-md-4 col-sm-4 col-xs-12">
                             <div id="reportrange" class="pull-right"
@@ -97,17 +97,20 @@
                                 <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
                             </div>
                         </div>
-                        <div class="col-md-2 col-sm-2 col-xs-12">
-                            <button type="button"
-                                    style="margin-bottom: 10px !important;"
-                                    class="btn btn-primary" title="重置" onclick="clearParams();">
-                                <i class="fa fa-rotate-left"></i>
-                            </button>
+                        <div class="col-md-3 col-sm-3 col-xs-12" style="padding: 2px 4px;">
                             <button type="button"
-                                    style="margin-bottom: 10px !important;float: right;margin-right: -1px;"
+                                    style="margin-bottom: 10px !important;float: right;margin-right: 10px;"
                                     class="btn btn-primary" id="queryListButton" title="查询">
                                 <i class="fa fa-search"></i>
                             </button>
+                            <button type="button" style="margin-bottom: 10px !important;float: right;margin-right: 10px;"  id="btn_excel" class="btn btn-primary"
+                                    title="导出EXCEL"><i class="fa fa-file-excel-o"></i>
+                            </button>
+                            <button type="button"
+                                    style="margin-bottom: 10px !important;float: right;margin-right: 10px;"
+                                    class="btn btn-primary" title="重置" onclick="clearParams();">
+                                <i class="fa fa-rotate-left"></i>
+                            </button>
                         </div>
                     </div>
                 </div>