Browse Source

日结重打

hurugang 6 years ago
parent
commit
195010b070

+ 166 - 80
src/main/java/cn/hnthyy/thmz/controller/ChargeFeeVoController.java

@@ -1,28 +1,25 @@
 package cn.hnthyy.thmz.controller;
 
+import cn.hnthyy.thmz.Utils.DateUtil;
 import cn.hnthyy.thmz.Utils.JsonUtil;
 import cn.hnthyy.thmz.Utils.TokenUtil;
 import cn.hnthyy.thmz.comment.UserLoginToken;
 import cn.hnthyy.thmz.entity.MzException;
+import cn.hnthyy.thmz.entity.his.Employee;
 import cn.hnthyy.thmz.entity.his.MzReceiptSerial;
 import cn.hnthyy.thmz.entity.his.MzyZdChargeType;
 import cn.hnthyy.thmz.entity.his.ZdChequeType;
 import cn.hnthyy.thmz.entity.thmz.User;
 import cn.hnthyy.thmz.enums.PayMarkEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
-import cn.hnthyy.thmz.service.his.ChargeFeeVoService;
-import cn.hnthyy.thmz.service.his.MzyZdChargeTypeService;
-import cn.hnthyy.thmz.service.his.ZdChequeTypeService;
-import cn.hnthyy.thmz.service.his.ZdUnitCodeService;
+import cn.hnthyy.thmz.service.his.*;
+import cn.hnthyy.thmz.service.thmz.UserService;
 import cn.hnthyy.thmz.vo.*;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -40,7 +37,10 @@ public class ChargeFeeVoController {
     private MzyZdChargeTypeService mzyZdChargeTypeService;
     @Autowired
     private ZdChequeTypeService zdChequeTypeService;
-
+    @Autowired
+    private EmployeeService employeeService;
+    @Autowired
+    private UserService userService;
     /**
      * 查询日结列表收费清单 未结账
      *
@@ -148,7 +148,7 @@ public class ChargeFeeVoController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getChargeFeeVoReprint", method = {RequestMethod.GET, RequestMethod.POST})
-    public Map<String, Object> getChargeFeeVoReprint(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> getChargeFeeVoReprint(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (chargeFeeParamsVo == null) {
@@ -157,27 +157,19 @@ public class ChargeFeeVoController {
                 return resultMap;
             }
             if (StringUtils.isBlank(chargeFeeParamsVo.getCaseType())) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "查询日结列表收费清单失败,结账基准参数为空");
-                return resultMap;
+                chargeFeeParamsVo.setCaseType(YesNoEnum.NO.code.toString());
             }
             if (chargeFeeParamsVo.getDcountDate() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询日结列表收费清单失败,结算时间为空");
                 return resultMap;
             }
-            User tokenUser = getUser(httpServletRequest);
             resultMap.put("code", 0);
             resultMap.put("message", "查询日结列表收费清单成功");
-            List<ChargeFeeVo> chargeFeeVos = chargeFeeVoService.queryChargeFeeVoReprint(tokenUser.getUserIdCode(), chargeFeeParamsVo.getCaseType(), chargeFeeParamsVo.getDcountDate());
+            List<ChargeFeeVo> chargeFeeVos = chargeFeeVoService.queryChargeFeeVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getCaseType(), chargeFeeParamsVo.getDcountDate());
             fomartChargeVo(chargeFeeVos);
             resultMap.put("data", chargeFeeVos);
             return resultMap;
-        } catch (MzException e) {
-            log.error("查询日结列表收费清单失败,错误信息{}", e.getMessage());
-            resultMap.put("code", -1);
-            resultMap.put("message", "查询日结列表收费清单失败");
-            return resultMap;
         } catch (Exception e) {
             log.error("查询日结列表收费清单失败,错误信息{}", e.getMessage());
             resultMap.put("code", -1);
@@ -187,49 +179,6 @@ public class ChargeFeeVoController {
     }
 
 
-    /**
-     * 可以被重打结算列表用户与日期列表
-     *
-     * @return
-     */
-    @UserLoginToken
-    @RequestMapping(value = "/getDcountDateList", method = {RequestMethod.GET, RequestMethod.POST})
-    public Map<String, Object> getDcountDateList(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo, HttpServletRequest httpServletRequest) {
-        Map<String, Object> resultMap = new HashMap<>();
-        try {
-            if (chargeFeeParamsVo == null) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败,参数为空");
-                return resultMap;
-            }
-            if (chargeFeeParamsVo.getBeginDate() == null) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败,开始时间为空");
-                return resultMap;
-            }
-            if (chargeFeeParamsVo.getEndDate() == null) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败,结束时间为空");
-                return resultMap;
-            }
-            User tokenUser = getUser(httpServletRequest);
-            resultMap.put("code", 0);
-            resultMap.put("message", "查询可以被重打结算列表用户与日期列表成功");
-            resultMap.put("data", chargeFeeVoService.queryDcountDateList(tokenUser.getUserIdCode(), chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
-            return resultMap;
-        } catch (MzException e) {
-            log.error("查询可以被重打结算列表用户与日期列表失败,错误信息{}", e.getMessage());
-            resultMap.put("code", -1);
-            resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败");
-            return resultMap;
-        } catch (Exception e) {
-            log.error("查询可以被重打结算列表用户与日期列表失败,错误信息{}", e.getMessage());
-            resultMap.put("code", -1);
-            resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败");
-            return resultMap;
-        }
-    }
-
 
     /**
      * 日结列表的挂号清单 未结账
@@ -281,7 +230,7 @@ public class ChargeFeeVoController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getReqrecVoReprint", method = {RequestMethod.GET, RequestMethod.POST})
-    public Map<String, Object> getReqrecVoReprint(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> getReqrecVoReprint(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (chargeFeeParamsVo == null) {
@@ -290,28 +239,20 @@ public class ChargeFeeVoController {
                 return resultMap;
             }
             if (StringUtils.isBlank(chargeFeeParamsVo.getCaseType())) {
-                resultMap.put("code", -1);
-                resultMap.put("message", "查询重打日结列表的挂号清单失败,结账基准参数为空");
-                return resultMap;
+                chargeFeeParamsVo.setCaseType(YesNoEnum.NO.code.toString());
             }
             if (chargeFeeParamsVo.getDcountDate() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询重打日结列表的挂号清单失败,结算时间为空");
                 return resultMap;
             }
-            User tokenUser = getUser(httpServletRequest);
             resultMap.put("code", 0);
             resultMap.put("message", "查询重打日结列表的挂号清单成功");
-            List<ReqrecVo> reqrecVos = chargeFeeVoService.queryReqrecVoReprint(tokenUser.getUserIdCode(), chargeFeeParamsVo.getCaseType(), chargeFeeParamsVo.getDcountDate());
+            List<ReqrecVo> reqrecVos = chargeFeeVoService.queryReqrecVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getCaseType(), chargeFeeParamsVo.getDcountDate());
             frmartReQrecVo(reqrecVos);
             resultMap.put("data", reqrecVos);
             return resultMap;
-        } catch (MzException e) {
-            log.error("查询重打日结列表的挂号清单失败,错误信息{}", e.getMessage());
-            resultMap.put("code", -1);
-            resultMap.put("message", "查询重打日结列表的挂号清单失败");
-            return resultMap;
-        } catch (Exception e) {
+        }  catch (Exception e) {
             log.error("查询重打日结列表的挂号清单失败,错误信息{}", e.getMessage());
             resultMap.put("code", -1);
             resultMap.put("message", "查询重打日结列表的挂号清单失败");
@@ -410,17 +351,84 @@ public class ChargeFeeVoController {
             resultMap.put("thzffpmx", chargeFeeVoService.queryThMzReceiptSerial(tokenUser.getUserIdCode(), null));
             resultMap.put("user", tokenUser);
             resultMap.put("code", 0);
-            resultMap.put("message", "查询费用日结收费所用票号成功");
+            resultMap.put("message", "查询费用日结报表成功");
             return resultMap;
         } catch (MzException e) {
-            log.error("查询费用日结收费所用票号失败,错误信息{}", e.getMessage());
+            log.error("查询费用日结报表失败,错误信息{}", e.getMessage());
             resultMap.put("code", -1);
-            resultMap.put("message", "查询费用日结收费所用票号失败");
+            resultMap.put("message", "查询费用日结报表失败");
+            return resultMap;
+        } catch (Exception e) {
+            log.error("查询费用日结报表失败,错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "查询费用日结报表失败");
+            return resultMap;
+        }
+    }
+
+
+
+    /**
+     * 重打费用日结报表
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getFullChargeReprint", method = {RequestMethod.GET, RequestMethod.POST})
+    public Map<String, Object> getFullChargeReprint(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (chargeFeeParamsVo == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询重打费用日结报表失败,参数为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(chargeFeeParamsVo.getCaseType())) {
+                chargeFeeParamsVo.setCaseType(YesNoEnum.NO.code.toString());
+            }
+            if (chargeFeeParamsVo.getDcountDate() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询重打费用日结报表失败,结算时间为空");
+                return resultMap;
+            }
+            MzReceiptSerial mzReceiptSerial = chargeFeeVoService.queryMzReceiptSerial(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate(), null, null).get(0);
+            resultMap.put("mzReceiptSerial", mzReceiptSerial);
+            ChargeCountVo chargeCountVo = chargeFeeVoService.queryChargeCountVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate(), null, null).get(0);
+            chargeCountVo.fomartChargeCountVo(mzReceiptSerial.getTotalCharge());
+            resultMap.put("chargeCountVo", chargeCountVo);
+            //收费所用票号
+            List<String> sfReceiptBills = getStrings(chargeFeeVoService.querySfReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("sfReceiptBills", sfReceiptBills);
+            //挂号所用票号
+            List<String> ghReceiptBills = getStrings(chargeFeeVoService.queryGhReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("ghReceiptBills", ghReceiptBills);
+            //收费发票张数
+            resultMap.put("sffps", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CHARGED.code, chargeFeeParamsVo.getDcountDate()));
+            //退费发票张数
+            resultMap.put("tpzs", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.RETURN_PREMIUM.code, chargeFeeParamsVo.getDcountDate()));
+            //作废收费发票张数
+            resultMap.put("zffps", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CANCELLATION.code, chargeFeeParamsVo.getDcountDate()));
+            //挂号发票张数
+            resultMap.put("ghfps", chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.NO.code.toString(), chargeFeeParamsVo.getDcountDate()));
+            //退号发票张数
+            resultMap.put("ghtpzs", chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate()));
+            //收费作废发票明细
+            resultMap.put("sfzffpmx", chargeFeeVoService.queryReceiptVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
+            //挂号收入构成表格数据
+            ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate(), null, null).get(0);
+            reqrecVo.fomartReqrecVo();
+            resultMap.put("ghsrgcmx", reqrecVo);
+            //退号发票明细
+            resultMap.put("thzffpmx", chargeFeeVoService.queryThMzReceiptSerial(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
+            User tokenUser=userService.queryUserByUserIdCode(chargeFeeParamsVo.getOpId());
+            resultMap.put("user", tokenUser);
+            resultMap.put("code", 0);
+            resultMap.put("message", "查询重打费用日结报表成功");
             return resultMap;
         } catch (Exception e) {
-            log.error("查询费用日结收费所用票号失败,错误信息{}", e.getMessage());
+            log.error("查询重打费用日结报表失败,错误信息{}", e.getMessage());
             resultMap.put("code", -1);
-            resultMap.put("message", "查询费用日结收费所用票号失败");
+            resultMap.put("message", "查询重打费用日结报表失败");
             return resultMap;
         }
     }
@@ -499,6 +507,84 @@ public class ChargeFeeVoController {
     }
 
 
+
+
+    /**
+     * 查询给定日期内收费员列表
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getAllOperator", method = {RequestMethod.GET, RequestMethod.POST})
+    public Map<String, Object> getAllOperator(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (chargeFeeParamsVo==null || chargeFeeParamsVo.getBeginDate()==null || chargeFeeParamsVo.getEndDate()==null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询给定日期内收费员列表失败,给定时间不能为空");
+                return resultMap;
+            }
+            Date beginDate= chargeFeeParamsVo.getBeginDate();
+            Date endDate = chargeFeeParamsVo.getEndDate();
+            List<String> operaotors = chargeFeeVoService.queryAllOperatorFromReceipt(beginDate,endDate);
+            List<String> ghOperaotors = chargeFeeVoService.queryAllOperatorFromReqrec(beginDate,endDate);
+            ghOperaotors.forEach(o->{
+                if(!operaotors.contains(o)){
+                    operaotors.add(o);
+                }
+            });
+            List<Employee> employees=employeeService.queryByCodes(operaotors);
+             resultMap.put("employees", employees);
+            resultMap.put("code", 0);
+            resultMap.put("message", "查询给定日期内收费员列表成功");
+            return resultMap;
+        } catch (Exception e) {
+            log.error("查询给定日期内收费员列表失败,错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "查询给定日期内收费员列表失败");
+            return resultMap;
+        }
+    }
+
+
+
+    /**
+     * 查询可以被重打结算列表用户与日期列表
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getDcountDateList", method = {RequestMethod.GET, RequestMethod.POST})
+    public Map<String, Object> getDcountDateList(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (chargeFeeParamsVo==null || chargeFeeParamsVo.getBeginDate()==null || chargeFeeParamsVo.getEndDate()==null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败,给定时间不能为空");
+                return resultMap;
+            }
+            if(StringUtils.isBlank(chargeFeeParamsVo.getOpId())){
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败,请选择要查询的收费员");
+                return resultMap;
+            }
+            Date beginDate= DateUtil.getFirstSecond(chargeFeeParamsVo.getBeginDate());
+            Date endDate = DateUtil.getLastSecond(chargeFeeParamsVo.getEndDate());
+            List<DcountDateListVo> dcountDateListVos = chargeFeeVoService.queryDcountDateList(chargeFeeParamsVo.getOpId(),beginDate,endDate);
+            resultMap.put("dcountDateListVos", dcountDateListVos);
+            resultMap.put("code", 0);
+            resultMap.put("message", "查询可以被重打结算列表用户与日期列表成功");
+            return resultMap;
+        } catch (Exception e) {
+            log.error("查询可以被重打结算列表用户与日期列表失败,错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "查询可以被重打结算列表用户与日期列表失败");
+            return resultMap;
+        }
+    }
+
+
+
     /**
      * 重打日结收费所用票号
      *

+ 11 - 0
src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

@@ -86,4 +86,15 @@ public class NavigationController {
     public String daily() {
         return "daily";
     }
+
+
+
+    /**
+     * 打开重打日结报表页面
+     * @return
+     */
+    @RequestMapping("/daily-repeat-print")
+    public String dailyRepeatPrint() {
+        return "daily_repeat_print";
+    }
 }

+ 30 - 11
src/main/java/cn/hnthyy/thmz/mapper/his/ChargeFeeVoMapper.java

@@ -114,13 +114,13 @@ public interface ChargeFeeVoMapper {
             "         mz_receipt_serial.dcount_date " +
             "    FROM mz_receipt_serial " +
             "where  operator_id = #{userIdCode} and " +
-            "       dcount_date &gt;=#{beginDate,jdbcType=TIMESTAMP} and dcount_date &lt;= #{endDate,jdbcType=TIMESTAMP} " +
+            "       dcount_date >=#{beginDate,jdbcType=TIMESTAMP} and dcount_date <= #{endDate,jdbcType=TIMESTAMP} " +
             "union " +
             "SELECT distinct mzy_reqrec.op_id," +
             "         mzy_reqrec.closing_date " +
             "    FROM mzy_reqrec " +
-            "where  op_id =#{userIdCode}and " +
-            "       closing_date &gt;= #{beginDate,jdbcType=TIMESTAMP} and closing_date &lt;= #{endDate,jdbcType=TIMESTAMP} " +
+            "where  op_id =#{userIdCode} and " +
+            "       closing_date >= #{beginDate,jdbcType=TIMESTAMP} and closing_date <= #{endDate,jdbcType=TIMESTAMP} " +
             "order by dcount_date desc")
     List<DcountDateListVo> selectDcountDateList(@Param("userIdCode") String userIdCode, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
@@ -255,13 +255,13 @@ public interface ChargeFeeVoMapper {
      * @return
      */
     @Select("  SELECT mz_receipt_serial.pay_mark," +
-            "         mz_receipt_serial.receipt_bill," +
+            "          rtrim(mz_receipt_serial.receipt_bill) receipt_bill," +
             "         mz_receipt_serial.serial_no " +
             "    FROM mz_receipt_serial " +
             "   WHERE mz_receipt_serial.operator_id =#{userIdCode}  and mz_receipt_serial.dcount_no=1 " +
-            "         and mz_receipt_serial.pay_mark  <![CDATA[<>]]> '1' and dcount_date=#{dcountDate,jdbcType=TIMESTAMP}  and cheque_type  <![CDATA[<>]]> 'Y' " +
+            "         and mz_receipt_serial.pay_mark <>'1' and dcount_date=#{dcountDate,jdbcType=TIMESTAMP}  and cheque_type  <> 'Y' " +
             "  order by mz_receipt_serial.receipt_bill  ")
-    List<ReqrecVo> selectSfReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
+    List<ReceiptBillVo> selectSfReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
 
     /**
@@ -272,13 +272,13 @@ public interface ChargeFeeVoMapper {
      * @return
      */
     @Select("    SELECT cancel_mark =mzy_reqrec.cancel_mark," +
-            "         receipt_bill =mzy_reqrec.receipt_bill," +
+            "        receipt_bill = rtrim(mzy_reqrec.receipt_bill)," +
             "         serial_no =mzy_reqrec.serial_no " +
             "    FROM mzy_reqrec " +
-            " where mzy_reqrec.op_id like #{userIdCode} and dcount_no=1 and cancel_mark  <![CDATA[<>]]> '1' and " +
-            "       closing_date =#{dcountDate,jdbcType=TIMESTAMP} " +
+            " where mzy_reqrec.op_id = #{userIdCode} and dcount_no=1 and cancel_mark <> '1' and " +
+            "       closing_date =#{dcountDate} " +
             "order by op_id,mzy_reqrec.receipt_bill ")
-    List<ReqrecVo> selectGhReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
+    List<ReceiptBillVo> selectGhReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
     /**
      * 收款类别数据汇总,当参数只有用户编号时是查询未结算数据,有用户编号和 dcountDate 结算时间是查询 重新打印结算单  当只有开始和结束时间时是查询结算汇总
@@ -310,7 +310,7 @@ public interface ChargeFeeVoMapper {
                     "count ( distinct case when cheque_type ='1' and pay_mark ='0' then receipt_sn else null end ) xjbs," +
                     "  count ( distinct case when ( cheque_type ='5' or cheque_type ='3' ) and pay_mark ='0' then receipt_sn else null end ) yhsbs," +
                     "  count ( distinct case when cheque_type ='6' and pay_mark ='0' then receipt_sn else null end ) sybbs," +
-                    " count ( distinct case when cheque_type in ( '2' , 'Y' ) and pay_mark ='0' and responce_type ='01' then receipt_sn else null end ) zfssbs," +
+                    " count ( distinct case when cheque_type in ( '2' , 'Y' ) and pay_mark ='0' and responce_type ='01' then receipt_sn else null end ) zfbs," +
                     " count ( distinct case when cheque_type ='1' and pay_mark &gt; '0' then receipt_sn else null end ) xjtfbs," +
                     "count ( distinct case when ( cheque_type ='5' or cheque_type ='3' ) and pay_mark &gt; '0' then receipt_sn else null end ) yhktfbs," +
                     "count ( distinct case when cheque_type ='6' and pay_mark &gt; '0' then receipt_sn else null end ) sybtfbs," +
@@ -593,4 +593,23 @@ 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 beginDate
+     * @param endDate
+     * @return
+     */
+    @Select("select operator_id from  mz_receipt_serial where dcount_date >=#{beginDate,jdbcType=TIMESTAMP} and dcount_date <=#{endDate,jdbcType=TIMESTAMP} group by operator_id")
+    List<String> selectAllOperatorFromReceipt(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    /**
+     * 在挂号表中查询当前日期范围内有收款记录的收费员
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    @Select("select op_id from  mzy_reqrec where closing_date >=#{beginDate,jdbcType=TIMESTAMP} and closing_date <=#{endDate,jdbcType=TIMESTAMP} group by op_id")
+    List<String> selectAllOperatorFromReqrec(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
 }

+ 18 - 2
src/main/java/cn/hnthyy/thmz/service/his/ChargeFeeVoService.java

@@ -101,7 +101,7 @@ public interface ChargeFeeVoService {
      * @param dcountDate
      * @return
      */
-    List<ReqrecVo> querySfReceiptBillVoReprint(String userIdCode, Date dcountDate);
+    List<ReceiptBillVo> querySfReceiptBillVoReprint(String userIdCode, Date dcountDate);
 
 
     /**
@@ -111,7 +111,7 @@ public interface ChargeFeeVoService {
      * @param dcountDate
      * @return
      */
-    List<ReqrecVo> queryGhReceiptBillVoReprint(String userIdCode,Date dcountDate);
+    List<ReceiptBillVo> queryGhReceiptBillVoReprint(String userIdCode,Date dcountDate);
 
     /**
      * 收款类别数据汇总,当参数只有用户编号时是查询未结算数据,有用户编号和 dcountDate 结算时间是查询 重新打印结算单  当只有开始和结束时间时是查询结算汇总
@@ -204,4 +204,20 @@ public interface ChargeFeeVoService {
      */
     Date dcountCharge(String userIdCode);
 
+
+    /**
+     * 在发票表中查询当前日期范围内有收款记录的收费员
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    List<String> queryAllOperatorFromReceipt(Date beginDate, Date endDate);
+
+    /**
+     * 在挂号表中查询当前日期范围内有收款记录的收费员
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    List<String> queryAllOperatorFromReqrec(Date beginDate, Date endDate);
 }

+ 12 - 2
src/main/java/cn/hnthyy/thmz/service/impl/his/ChargeFeeVoServiceImpl.java

@@ -75,12 +75,12 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
     }
 
     @Override
-    public List<ReqrecVo> querySfReceiptBillVoReprint(String userIdCode, Date dcountDate) {
+    public List<ReceiptBillVo> querySfReceiptBillVoReprint(String userIdCode, Date dcountDate) {
         return chargeFeeVoMapper.selectSfReceiptBillVoReprint(userIdCode, dcountDate);
     }
 
     @Override
-    public List<ReqrecVo> queryGhReceiptBillVoReprint(String userIdCode, Date dcountDate) {
+    public List<ReceiptBillVo> queryGhReceiptBillVoReprint(String userIdCode, Date dcountDate) {
         return chargeFeeVoMapper.selectGhReceiptBillVoReprint(userIdCode, dcountDate);
     }
 
@@ -138,4 +138,14 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
         chargeFeeVoMapper.dcountReqrec(userIdCode, dcountDate);
         return dcountDate;
     }
+
+    @Override
+    public List<String> queryAllOperatorFromReceipt(Date beginDate, Date endDate) {
+        return chargeFeeVoMapper.selectAllOperatorFromReceipt(beginDate,endDate);
+    }
+
+    @Override
+    public List<String> queryAllOperatorFromReqrec(Date beginDate, Date endDate) {
+        return chargeFeeVoMapper.selectAllOperatorFromReqrec(beginDate,endDate);
+    }
 }

+ 10 - 0
src/main/java/cn/hnthyy/thmz/vo/ChargeFeeParamsVo.java

@@ -1,7 +1,9 @@
 package cn.hnthyy.thmz.vo;
 
 import cn.hnthyy.thmz.enums.YesNoEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -11,13 +13,21 @@ import java.util.Date;
 @Data
 public class ChargeFeeParamsVo {
     //开始时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date beginDate;
     //结束时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date endDate;
     //结算时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8")
     private Date dcountDate;
     //是否是历史数据,Yes 历史数据
     private YesNoEnum hisDate;
     // 0 结账基准  1  收费基准
     private  String caseType;
+    //操作员编码
+    private String opId;
 }

+ 10 - 0
src/main/java/cn/hnthyy/thmz/vo/DcountDateListVo.java

@@ -1,6 +1,8 @@
 package cn.hnthyy.thmz.vo;
 
 import lombok.Data;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 import java.util.Date;
 
@@ -11,4 +13,12 @@ import java.util.Date;
 public class DcountDateListVo {
     private String operatorId;
     private Date  dcountDate;
+    private String dcountDateStr;
+
+    public void setDcountDate(Date dcountDate) {
+        this.dcountDate = dcountDate;
+        if(dcountDate!=null){
+            dcountDateStr= DateFormatUtils.format(dcountDate, "yyyy-MM-dd HH:mm:ss:SSS");
+        }
+    }
 }

+ 2 - 2
src/main/resources/application.yml

@@ -13,8 +13,8 @@ spring:
       max-request-size: 100MB
   datasource:
     his:
-      #jdbc-url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-      jdbc-url: "jdbc:sqlserver://172.16.32.160:1433;databaseName=thxyhisdb"
+      jdbc-url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
+      #jdbc-url: "jdbc:sqlserver://172.16.32.160:1433;databaseName=thxyhisdb"
       username: "sa"
       password:
       #password: "SAthyy123"

+ 1 - 46
src/main/resources/static/js/daily.js

@@ -3,18 +3,12 @@ var LODOP; //声明为全局变量
 //默认打印机下标
 var printIndex = -1;
 $(function () {
-    init_daterangepicker();
     initFeeTable();
     //重置查询参数
     $('#btn_clean').click(function () {
         cleanParams();
     });
     //初始化页面上面的按钮事件
-    //查询
-    $('#btn_query').click(function () {
-        initFeeTable();
-    });
-
     $("#btn_daily").click(function (t) {
         dcountCharge();
     });
@@ -664,35 +658,6 @@ function getsfqd() {
     });
 }
 
-/**
- * 构建列表查询参数
- * @param params
- * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
- */
-function queryParams(params) {
-    var rePortRangeArr = getRePortRangeArr();
-    var payMarkGroup = getIndex("pay_mark_group");
-    var temp = {
-        mzChargeDetail: {
-            patientId: $("#patientId").val(),
-            warnDept: $("#deptNoParam").val(),
-            doctorCode: $("#doctorParam").val(),
-            name: $("#name").val(),
-            payMark: 5
-        },
-        beginTime: new Date(rePortRangeArr[0]),
-        endTime: new Date(rePortRangeArr[1]),
-        pageSize: params.limit,   //页面大小
-        pageIndex: params.offset / params.limit,  //页码
-        serialNo: $("#serialNo").val(),
-    };
-    if (payMarkGroup == 1) {
-        temp.mzChargeDetail.payMark = 0;
-    } else if (payMarkGroup == 2) {
-        temp.mzChargeDetail.payMark = 1;
-    }
-    return temp;
-};
 
 
 /**
@@ -712,17 +677,7 @@ function getIndex(id) {
     return index;
 }
 
-/**
- * 获取时间选择器的时间数组
- * @returns {string[]}
- */
-function getRePortRangeArr() {
-    var rePortRange = $('#reportrange span').html();
-    var rePortRangeArr = rePortRange.split(" - ");
-    rePortRangeArr[0] = rePortRangeArr[0] + " 00:00:00"
-    rePortRangeArr[1] = rePortRangeArr[1] + " 23:59:59"
-    return rePortRangeArr;
-}
+
 
 
 /**

+ 921 - 0
src/main/resources/static/js/daily_repeat_print.js

@@ -0,0 +1,921 @@
+//@ sourceURL=daily_repeat_print.js
+var LODOP; //声明为全局变量
+//默认打印机下标
+var printIndex = -1;
+$(function () {
+    //init_daterangepicker();
+    daterangepicker(getAllOperator);
+    //  initFeeTable();
+    //重置查询参数
+    $('#btn_clean').click(function () {
+        cleanParams();
+    });
+    //初始化页面上面的按钮事件
+    $("#btn_daily").click(function (t) {
+        print();
+    });
+
+    setTimeout(function () {
+        getLodop();
+    }, 400);
+
+    $(".selectpicker").selectpicker({
+        dropuAuto: false
+    });
+});
+
+/**
+ * 列表类型按钮切换事件
+ * @param object
+ */
+function reportButtonChange(object) {
+    $("#pay_mark_group").find("button").each(function (index, element) {
+        if ($(element).hasClass("btn-primary")) {
+            $(element).removeClass("btn-primary").addClass("btn-default");
+        }
+    });
+    $(object).removeClass("btn-default").addClass("btn-primary");
+    initFeeTable();
+}
+
+
+/**
+ * 初始化收费表格
+ */
+function initFeeTable() {
+    $('#tb_table').bootstrapTable("destroy");
+    $("#report_table").removeClass("in").addClass("hide");
+    var payMarkGroup = getIndex("pay_mark_group");
+    if (payMarkGroup == 0) {
+        getRjbb();
+    } else if (payMarkGroup == 1) {
+        getsfqd();
+    } else if (payMarkGroup == 2) {
+        getGhqd();
+    }
+
+}
+
+/**
+ * 获取日结报表
+ */
+function getRjbb() {
+    $("#report_table").removeClass("hide").addClass("in");
+    $.ajax({
+        type: "POST",
+        url: '/thmz/getFullChargeReprint',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        data: JSON.stringify({opId: $('#cashParam').val(),dcountDate: $('#rjList').val()}),
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                $("#userIdCode").html(res.user.userCode);
+                $("#username").html(res.user.userName);
+                $("#dcountDate").html(format($("#rjList").val(), "yyyy-MM-dd HH:mm:ss"));
+                $("#charge1").html(res.mzReceiptSerial.charge1.toFixed(2));
+                $("#charge2").html(res.mzReceiptSerial.charge2.toFixed(2));
+                $("#charge3").html(res.mzReceiptSerial.charge3.toFixed(2));
+                $("#charge4").html(res.mzReceiptSerial.charge4.toFixed(2));
+                $("#charge5").html(res.mzReceiptSerial.charge5.toFixed(2));
+                $("#charge6").html(res.mzReceiptSerial.charge6.toFixed(2));
+                $("#charge7").html(res.mzReceiptSerial.charge7.toFixed(2));
+                $("#charge8").html(res.mzReceiptSerial.charge8.toFixed(2));
+                $("#charge9").html(res.mzReceiptSerial.charge9.toFixed(2));
+                $("#charge10").html(res.mzReceiptSerial.charge10.toFixed(2));
+                $("#charge11").html(res.mzReceiptSerial.charge11.toFixed(2));
+                $("#charge12").html(res.mzReceiptSerial.charge12.toFixed(2));
+                $("#charge13").html(res.mzReceiptSerial.charge13.toFixed(2));
+                $("#charge14").html(res.mzReceiptSerial.charge14.toFixed(2));
+                $("#charge15").html(res.mzReceiptSerial.charge15.toFixed(2));
+                $("#charge16").html(res.mzReceiptSerial.charge16.toFixed(2));
+                $("#charge17").html(res.mzReceiptSerial.charge17.toFixed(2));
+                $("#charge18").html(res.mzReceiptSerial.charge18.toFixed(2));
+                $("#charge19").html(res.mzReceiptSerial.charge19.toFixed(2));
+                $("#charge20").html(res.mzReceiptSerial.charge20.toFixed(2));
+                $("#totalCharge").html(res.mzReceiptSerial.totalCharge.toFixed(2));
+
+                $("#userIdCode_p").html(res.user.userCode);
+                $("#username_p").html(res.user.userName);
+                $("#dcountDate_p").html(format($("#rjList").val(), "yyyy-MM-dd HH:mm:ss"));
+                $("#charge1_p").html(res.mzReceiptSerial.charge1.toFixed(2));
+                $("#charge2_p").html(res.mzReceiptSerial.charge2.toFixed(2));
+                $("#charge3_p").html(res.mzReceiptSerial.charge3.toFixed(2));
+                $("#charge4_p").html(res.mzReceiptSerial.charge4.toFixed(2));
+                $("#charge5_p").html(res.mzReceiptSerial.charge5.toFixed(2));
+                $("#charge6_p").html(res.mzReceiptSerial.charge6.toFixed(2));
+                $("#charge7_p").html(res.mzReceiptSerial.charge7.toFixed(2));
+                $("#charge8_p").html(res.mzReceiptSerial.charge8.toFixed(2));
+                $("#charge9_p").html(res.mzReceiptSerial.charge9.toFixed(2));
+                $("#charge10_p").html(res.mzReceiptSerial.charge10.toFixed(2));
+                $("#charge11_p").html(res.mzReceiptSerial.charge11.toFixed(2));
+                $("#charge12_p").html(res.mzReceiptSerial.charge12.toFixed(2));
+                $("#charge13_p").html(res.mzReceiptSerial.charge13.toFixed(2));
+                $("#charge14_p").html(res.mzReceiptSerial.charge14.toFixed(2));
+                $("#charge15_p").html(res.mzReceiptSerial.charge15.toFixed(2));
+                $("#charge16_p").html(res.mzReceiptSerial.charge16.toFixed(2));
+                $("#charge17_p").html(res.mzReceiptSerial.charge17.toFixed(2));
+                $("#charge18_p").html(res.mzReceiptSerial.charge18.toFixed(2));
+                $("#charge19_p").html(res.mzReceiptSerial.charge19.toFixed(2));
+                $("#charge20_p").html(res.mzReceiptSerial.charge20.toFixed(2));
+                $("#totalCharge_p").html(res.mzReceiptSerial.totalCharge.toFixed(2));
+
+                //现金收款
+                $("#xjbs").html(res.chargeCountVo.xjbs);
+                $("#xjbs_p").html(res.chargeCountVo.xjbs);
+                if (res.chargeCountVo.xjsk != null) {
+                    $("#xjsk").html(res.chargeCountVo.xjsk.toFixed(2));
+                    $("#xjsk_p").html(res.chargeCountVo.xjsk.toFixed(2));
+                }
+                $("#xjtfbs").html(res.chargeCountVo.xjtfbs);
+                $("#xjtfbs_p").html(res.chargeCountVo.xjtfbs);
+                if (res.chargeCountVo.xjtf != null) {
+                    $("#xjtf").html(res.chargeCountVo.xjtf.toFixed(2));
+                    $("#xjtf_p").html(res.chargeCountVo.xjtf.toFixed(2));
+                }
+                $("#xjssbs").html(res.chargeCountVo.xjssbs);
+                $("#xjssbs_p").html(res.chargeCountVo.xjssbs);
+                if (res.chargeCountVo.xjss != null) {
+                    $("#xjss").html(res.chargeCountVo.xjss.toFixed(2));
+                    $("#xjss_p").html(res.chargeCountVo.xjss.toFixed(2));
+                }
+                //银行卡收款
+                $("#yhsbs").html(res.chargeCountVo.yhsbs);
+                $("#yhsbs_p").html(res.chargeCountVo.yhsbs);
+                if (res.chargeCountVo.yhksk != null) {
+                    $("#yhksk").html(res.chargeCountVo.yhksk.toFixed(2));
+                    $("#yhksk_p").html(res.chargeCountVo.yhksk.toFixed(2));
+                }
+                $("#yhktfbs").html(res.chargeCountVo.yhktfbs);
+                $("#yhktfbs_p").html(res.chargeCountVo.yhktfbs);
+                if (res.chargeCountVo.yhktf != null) {
+                    $("#yhktf").html(res.chargeCountVo.yhktf.toFixed(2));
+                    $("#yhktf_p").html(res.chargeCountVo.yhktf.toFixed(2));
+                }
+                $("#yhkssbs").html(res.chargeCountVo.yhkssbs);
+                $("#yhkssbs_p").html(res.chargeCountVo.yhkssbs);
+                if (res.chargeCountVo.yhkss != null) {
+                    $("#yhkss").html(res.chargeCountVo.yhkss.toFixed(2));
+                    $("#yhkss_p").html(res.chargeCountVo.yhkss.toFixed(2));
+                }
+                //支付宝收款
+                $("#zfbbs").html(res.chargeCountVo.zfbbs);
+                $("#zfbbs_p").html(res.chargeCountVo.zfbbs);
+                if (res.chargeCountVo.zfbsk != null) {
+                    $("#zfbsk").html(res.chargeCountVo.zfbsk.toFixed(2));
+                    $("#zfbsk_p").html(res.chargeCountVo.zfbsk.toFixed(2));
+                }
+                $("#zfbtfbs").html(res.chargeCountVo.zfbtfbs);
+                $("#zfbtfbs_p").html(res.chargeCountVo.zfbtfbs);
+                if (res.chargeCountVo.zfbtf != null) {
+                    $("#zfbtf").html(res.chargeCountVo.zfbtf.toFixed(2));
+                    $("#zfbtf_p").html(res.chargeCountVo.zfbtf.toFixed(2));
+                }
+                $("#zfbssbs").html(res.chargeCountVo.zfbssbs);
+                $("#zfbssbs_p").html(res.chargeCountVo.zfbssbs);
+                if (res.chargeCountVo.zfbss != null) {
+                    $("#zfbss").html(res.chargeCountVo.zfbss.toFixed(2));
+                    $("#zfbss_p").html(res.chargeCountVo.zfbss.toFixed(2));
+                }
+                //微信收款
+                $("#wxbs").html(res.chargeCountVo.wxbs);
+                $("#wxbs_p").html(res.chargeCountVo.wxbs);
+                if (res.chargeCountVo.wxsk != null) {
+                    $("#wxsk").html(res.chargeCountVo.wxsk.toFixed(2));
+                    $("#wxsk_p").html(res.chargeCountVo.wxsk.toFixed(2));
+                }
+                $("#wxtfbs").html(res.chargeCountVo.wxtfbs);
+                $("#wxtfbs_p").html(res.chargeCountVo.wxtfbs);
+                if (res.chargeCountVo.wxtf != null) {
+                    $("#wxtf").html(res.chargeCountVo.wxtf.toFixed(2));
+                }
+                $("#wxssbs").html(res.chargeCountVo.wxssbs);
+                $("#wxssbs_p").html(res.chargeCountVo.wxssbs);
+                if (res.chargeCountVo.wxss != null) {
+                    $("#wxss").html(res.chargeCountVo.wxss.toFixed(2));
+                    $("#wxss_p").html(res.chargeCountVo.wxss.toFixed(2));
+                }
+                //记账绿色通道收款
+                $("#zfbs").html(res.chargeCountVo.zfbs);
+                $("#zfbs_p").html(res.chargeCountVo.zfbs);
+                if (res.chargeCountVo.zfsk != null) {
+                    $("#zfsk").html(res.chargeCountVo.zfsk.toFixed(2));
+                    $("#zfsk_p").html(res.chargeCountVo.zfsk.toFixed(2));
+                }
+                $("#zftfbs").html(res.chargeCountVo.zftfbs);
+                $("#zftfbs_p").html(res.chargeCountVo.zftfbs);
+                if (res.chargeCountVo.zftf != null) {
+                    $("#zftf").html(res.chargeCountVo.zftf.toFixed(2));
+                    $("#zftf_p").html(res.chargeCountVo.zftf.toFixed(2));
+                }
+                $("#zfssbs").html(res.chargeCountVo.zfssbs);
+                $("#zfssbs_p").html(res.chargeCountVo.zfssbs);
+                if (res.chargeCountVo.zfss != null) {
+                    $("#zfss").html(res.chargeCountVo.zfss.toFixed(2));
+                    $("#zfss_p").html(res.chargeCountVo.zfss.toFixed(2));
+                }
+                //医保卡收款
+                $("#sybbs").html(res.chargeCountVo.sybbs);
+                $("#sybbs_p").html(res.chargeCountVo.sybbs);
+                if (res.chargeCountVo.sybksk != null) {
+                    $("#sybksk").html(res.chargeCountVo.sybksk.toFixed(2));
+                    $("#sybksk_p").html(res.chargeCountVo.sybksk.toFixed(2));
+                }
+                $("#sybtfbs").html(res.chargeCountVo.sybtfbs);
+                $("#sybtfbs_p").html(res.chargeCountVo.sybtfbs);
+                if (res.chargeCountVo.sybtf != null) {
+                    $("#sybtf").html(res.chargeCountVo.sybtf.toFixed(2));
+                    $("#sybtf_p").html(res.chargeCountVo.sybtf.toFixed(2));
+                }
+                $("#sybssbs").html(res.chargeCountVo.sybssbs);
+                $("#sybssbs_p").html(res.chargeCountVo.sybssbs);
+                if (res.chargeCountVo.sybkss != null) {
+                    $("#sybkss").html(res.chargeCountVo.sybkss.toFixed(2));
+                    $("#sybkss_p").html(res.chargeCountVo.sybkss.toFixed(2));
+                }
+                //总计收款
+                $("#zjbs").html(res.chargeCountVo.zjbs);
+                $("#zjbs_p").html(res.chargeCountVo.zjbs);
+                if (res.chargeCountVo.zjsk != null) {
+                    $("#zjsk").html(res.chargeCountVo.zjsk.toFixed(2));
+                    $("#zjsk_p").html(res.chargeCountVo.zjsk.toFixed(2));
+                }
+                $("#ztfbs").html(res.chargeCountVo.ztfbs);
+                $("#ztfbs_p").html(res.chargeCountVo.ztfbs);
+                if (res.chargeCountVo.zjtk != null) {
+                    $("#zjtk").html(res.chargeCountVo.zjtk.toFixed(2));
+                    $("#zjtk_p").html(res.chargeCountVo.zjtk.toFixed(2));
+                }
+                $("#zjssbs").html(res.chargeCountVo.zjssbs);
+                $("#zjssbs_p").html(res.chargeCountVo.zjssbs);
+                if (res.chargeCountVo.zjss != null) {
+                    $("#zjss").html(res.chargeCountVo.zjss.toFixed(2));
+                    $("#zjss_p").html(res.chargeCountVo.zjss.toFixed(2));
+                }
+
+                if (res.chargeCountVo.sjhj != null) {
+                    $("#sjhj").html(res.chargeCountVo.sjhj.toFixed(2));
+                    $("#sjhj_p").html(res.chargeCountVo.sjhj.toFixed(2));
+                }
+                $("#sjhjdx").html(res.chargeCountVo.sjhjdx);
+                $("#sjhjdx_p").html(res.chargeCountVo.sjhjdx);
+                if (res.chargeCountVo.zfss != null) {
+                    $("#zfsshj").html(res.chargeCountVo.zfss.toFixed(2));
+                    $("#zfsshj_p").html(res.chargeCountVo.zfss.toFixed(2));
+                }
+                $("#zfdx").html(res.chargeCountVo.zfdx);
+                $("#zfdx_p").html(res.chargeCountVo.zfdx);
+                if (res.chargeCountVo.zj != null) {
+                    $("#zj").html(res.chargeCountVo.zj.toFixed(2));
+                    $("#zj_p").html(res.chargeCountVo.zj.toFixed(2));
+                }
+                $("#zjdx").html(res.chargeCountVo.zjdx);
+                $("#zjdx_p").html(res.chargeCountVo.zjdx);
+
+                $("#sfReceiptBills").html(null);
+                $("#sfReceiptBills_p_table").html(null);
+                if (res.sfReceiptBills != null && res.sfReceiptBills.length > 0) {
+                    var html = '<div class="col-md-12 col-sm-12 col-xs-12">所用票号:</div>';
+                    var html_p = '';
+                    for (var i = 0; i < res.sfReceiptBills.length; i++) {
+                        html += '<div class="col-md-3 col-sm-3 col-xs-12">' + res.sfReceiptBills[i] + '</div>';
+
+                        if (i % 4 == 0) {
+                            html_p += '<tr>';
+                        }
+                        html_p += '<td>' + res.sfReceiptBills[i] + '</td>';
+                        if (i % 4 == 3 || i == res.sfReceiptBills.length - 1) {
+                            html_p += '</tr>';
+                        }
+                    }
+                    $("#sfReceiptBills").html(html);
+                    $("#sfReceiptBills_p_table").html(html_p);
+                }
+                $("#sffps").html(res.sffps);
+                $("#tpzs").html(res.tpzs);
+                $("#zffps").html(res.zffps);
+                $("#sffps_p").html(res.sffps);
+                $("#tpzs_p").html(res.tpzs);
+                $("#zffps_p").html(res.zffps);
+                if (res.sfzffpmx.length == 0) {
+                    $(".sfzffpmx").removeClass("in").addClass("hide");
+                    $("#sfzffpmx_p_table").css("display", "none");
+                    $("#sfzffpmx_table").css("display", "none");
+                } else if (res.sfzffpmx.length > 0) {
+                    $(".sfzffpmx").removeClass("hide").addClass("in");
+                    $("#sfzffpmx_p_table").css("display", "block");
+                    $("#sfzffpmx_table").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.sfzffpmx.length; i++) {
+                        var receiptBill = res.sfzffpmx[i].receiptBill;
+                        if (res.sfzffpmx[i].receiptBill != null && res.sfzffpmx[i].receiptBill.length > 8) {
+                            receiptBill = receiptBill.substring(0, 7);
+                        }
+                        if (i % 3 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + receiptBill + '</td>';
+                        html += '<td>' + res.sfzffpmx[i].name + '</td>';
+                        html += '<td>' + res.sfzffpmx[i].totalCharge.toFixed(2) + '</td>';
+                        if (i % 3 == 2 || i == res.sfzffpmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#sfzffpmx").html(html);
+                    $("#sfzffpmx_p").html(html);
+                }
+                $("#userIdCode_gh").html(res.user.userCode);
+                $("#username_gh").html(res.user.userName);
+                $("#dcountDate_gh").html(format($("#rjList").val(), "yyyy-MM-dd HH:mm:ss"));
+                $("#userIdCode_gh_p").html(res.user.userCode);
+                $("#username_gh_p").html(res.user.userName);
+                $("#dcountDate_gh_p").html(format($("#rjList").val(), "yyyy-MM-dd HH:mm:ss"));
+                if (res.ghsrgcmx.ghje != null) {
+                    $("#ghje").html(res.ghsrgcmx.ghje.toFixed(2));
+                    $("#ghje_p").html(res.ghsrgcmx.ghje.toFixed(2));
+                }
+                $("#ghfps").html("所用票数:" + res.ghfps);
+                $("#qmhs").html("全免号数:" + res.ghsrgcmx.qmhs);
+                $("#ghfps_p").html("所用票数:" + res.ghfps);
+                $("#qmhs_p").html("全免号数:" + res.ghsrgcmx.qmhs);
+                if (res.ghsrgcmx.jzhs != null) {
+                    $("#jzhs").html("记账号数:" + res.ghsrgcmx.jzhs);
+                    $("#jzhs_p").html("记账号数:" + res.ghsrgcmx.jzhs);
+                }
+                if (res.ghsrgcmx.jzje != null) {
+                    $("#jzje").html("记账金额:" + res.ghsrgcmx.jzje);
+                    $("#jzje_p").html("记账金额:" + res.ghsrgcmx.jzje);
+                }
+                if (res.ghsrgcmx.zcsr != null) {
+                    $("#zcsr").html("诊察收入:" + res.ghsrgcmx.zcsr.toFixed(2));
+                    $("#zcsr_p").html("诊察收入:" + res.ghsrgcmx.zcsr.toFixed(2));
+                }
+                if (res.ghsrgcmx.jcsr != null) {
+                    $("#jcsr").html("检查收入:" + res.ghsrgcmx.jcsr.toFixed(2));
+                    $("#jcsr_p").html("检查收入:" + res.ghsrgcmx.jcsr.toFixed(2));
+                }
+                if (res.ghsrgcmx.ghsr != null) {
+                    $("#ghsr").html("挂号费(门诊):" + res.ghsrgcmx.ghsr.toFixed(2));
+                    $("#ghsr_p").html("挂号费(门诊):" + res.ghsrgcmx.ghsr.toFixed(2));
+                }
+                if (res.ghsrgcmx.thje != null) {
+                    $("#thje").html(res.ghsrgcmx.thje.toFixed(2));
+                    $("#thje_p").html(res.ghsrgcmx.thje.toFixed(2));
+                }
+                $("#ghtpzs").html("退票数:" + res.ghtpzs);
+                $("#ghtpzs_p").html("退票数:" + res.ghtpzs);
+                if (res.ghsrgcmx.ghhj != null) {
+                    $("#ghhj").html(res.ghsrgcmx.ghhj.toFixed(2));
+                    $("#ghhj_p").html(res.ghsrgcmx.ghhj.toFixed(2));
+                }
+                if (res.ghsrgcmx.ghjebhjz != null) {
+                    $("#ghjebhjz").html("合计(不含记账)   " + res.ghsrgcmx.ghjebhjz.toFixed(2));
+                    $("#ghjebhjz_p").html("合计(不含记账)   " + res.ghsrgcmx.ghjebhjz.toFixed(2));
+                }
+                $("#ghhjdx").html(res.ghsrgcmx.ghhjdx);
+                $("#ghjebhjzdx").html("合计(不含记账)   " + res.ghsrgcmx.ghjebhjzdx);
+                $("#ghhjdx_p").html(res.ghsrgcmx.ghhjdx);
+                $("#ghjebhjzdx_p").html("合计(不含记账)   " + res.ghsrgcmx.ghjebhjzdx);
+                $("#ghReceiptBills").html(null);
+                $("#ghReceiptBills_p_table").html(null);
+                if (res.ghReceiptBills != null && res.ghReceiptBills.length > 0) {
+                    var html = '<div class="col-md-12 col-sm-12 col-xs-12">所用票号:</div>';
+                    var html_p = '';
+                    for (var i = 0; i < res.ghReceiptBills.length; i++) {
+                        html += '<div class="col-md-3 col-sm-3 col-xs-12">' + res.ghReceiptBills[i] + '</div>';
+
+                        if (i % 4 == 0) {
+                            html_p += '<tr>';
+                        }
+                        html_p += '<td>' + res.ghReceiptBills[i] + '</td>';
+                        if (i % 4 == 3 || i == res.ghReceiptBills.length - 1) {
+                            html_p += '</tr>';
+                        }
+                    }
+                    $("#ghReceiptBills").html(html);
+                    $("#ghReceiptBills_p_table").html(html_p);
+                }
+                $("#username_zbr").html(res.user.userName);
+                $("#username_zbr_p").html(res.user.userName);
+                if (res.thzffpmx.length == 0) {
+                    $("#thzffpmx_table").css("display", "none");
+                    $("#thzffpmx_table_p").css("display", "none");
+                } else if (res.sfzffpmx.length > 0) {
+                    $("#thzffpmx_table").css("display", "block");
+                    $("#thzffpmx_table_p").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.thzffpmx.length; i++) {
+                        var receiptBill = res.thzffpmx[i].receiptBill;
+                        if (res.thzffpmx[i].receiptBill != null && res.thzffpmx[i].receiptBill.length > 8) {
+                            receiptBill = receiptBill.substring(0, 7);
+                        }
+                        if (i % 3 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + receiptBill + '</td>';
+                        html += '<td>' + res.thzffpmx[i].name + '</td>';
+                        html += '<td>' + res.thzffpmx[i].totalCharge.toFixed(2) + '</td>';
+                        if (i % 3 == 2 || i == res.thzffpmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#thzffpmx").html(html);
+                    $("#thzffpmx_p").html(html);
+                }
+            } else if (res.code == -1) {
+                new PNotify({
+                    title: '错误提示',
+                    text: res.message,
+                    type: 'error',
+                    hide: true,
+                    styling: 'bootstrap3'
+                });
+            }
+        }
+    });
+}
+
+/**
+ * 挂号清单
+ */
+function getGhqd() {
+    $('#tb_table').bootstrapTable({
+        url: '/thmz/getReqrecVoReprint',         //请求后台的URL(*)
+        method: 'post',                      //请求方式(*)
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*)
+        pagination: true,                   //是否显示分页(*)
+        sortable: true,                     //是否启用排序
+        sortOrder: "asc",                   //排序方式
+        queryParams: queryParams,           //传递参数(*)
+        sidePagination: "client",           //分页方式:client客户端分页,server服务端分页(*)
+        pageNumber: 1,                       //初始化加载第一页,默认第一页
+        pageSize: 10,                       //每页的记录行数(*)
+        pageList: [10, 25, 50, 100],        //可供选择的每页的行数(*)
+        search: false,                       //是否显示表格搜索,此搜索是客户端搜索,不会进服务端,所以,个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识,一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                field: 'receiptBill',
+                title: '收据号',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'serialNo',
+                title: '机制号',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'patientId',
+                title: '病人ID',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'name',
+                title: '病人姓名',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'unitCode',
+                title: '科别',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'chargeType',
+                title: '号别',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'cancelMark',
+                title: '状态',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'chargeFee',
+                title: '金额',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return value.toFixed(2);
+                }
+            }, {
+                field: 'opDay',
+                title: '挂号日期',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
+            }
+        ],
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                    new PNotify({
+                        title: '错误提示',
+                        text: ress.message,
+                        type: 'error',
+                        hide: true,
+                        styling: 'bootstrap3'
+                    });
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            return {
+                "total": ress.data.length,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}
+
+/**
+ * 收费请单
+ */
+function getsfqd() {
+    $('#tb_table').bootstrapTable({
+        url: '/thmz/getChargeFeeVoReprint',         //请求后台的URL(*)
+        method: 'post',                      //请求方式(*)
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*)
+        pagination: true,                   //是否显示分页(*)
+        sortable: true,                     //是否启用排序
+        sortOrder: "asc",                   //排序方式
+        queryParams: queryParams,           //传递参数(*)
+        sidePagination: "client",           //分页方式:client客户端分页,server服务端分页(*)
+        pageNumber: 1,                       //初始化加载第一页,默认第一页
+        pageSize: 10,                       //每页的记录行数(*)
+        pageList: [10, 25, 50, 100],        //可供选择的每页的行数(*)
+        search: false,                       //是否显示表格搜索,此搜索是客户端搜索,不会进服务端,所以,个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识,一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                field: 'patientId',
+                title: '病人ID',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'serialNo',
+                title: '机制号',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'payMark',
+                title: '退欠标识',
+                align: "center",
+                valign: 'middle',
+            }, {
+                field: 'totalCharge',
+                title: '金额',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return value.toFixed(2);
+                }
+            }, {
+                field: 'receiptBill',
+                title: '发票号',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'chequeType',
+                title: '付款方式',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'chargeDate',
+                title: '收费日期',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
+            }
+        ],
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                    new PNotify({
+                        title: '错误提示',
+                        text: ress.message,
+                        type: 'error',
+                        hide: true,
+                        styling: 'bootstrap3'
+                    });
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            return {
+                "total": ress.data.length,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}
+
+/**
+ * 构建列表查询参数
+ * @param params
+ * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
+ */
+function queryParams(params) {
+    var temp = {
+        opId: $('#cashParam').val(),
+        dcountDate: $('#rjList').val()
+    };
+
+    return temp;
+};
+
+
+/**
+ * 获取按钮组选择的下标
+ * @param id
+ * @returns {number}
+ */
+function getIndex(id) {
+    var index = 0;
+    var item = $("#" + id).find("button");
+    for (var i = 0; i <= item.length; i++) {
+        if ($(item[i]).hasClass("btn-primary")) {
+            index = i;
+            break;
+        }
+    }
+    return index;
+}
+
+/**
+ * 获取时间选择器的时间数组
+ * @returns {string[]}
+ */
+function getRePortRangeArr() {
+    var rePortRange = $('#reportrange span').html();
+    var rePortRangeArr = rePortRange.split(" - ");
+    rePortRangeArr[0] = rePortRangeArr[0] + " 00:00:00"
+    rePortRangeArr[1] = rePortRangeArr[1] + " 23:59:59"
+    return rePortRangeArr;
+}
+
+
+/**
+ * 查询默认打印机
+ */
+function setPrint() {
+    if (printIndex >= 0) {
+        return;
+    }
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getLastWindowsByCurrentUser',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                printIndex = res.data.cgPrintIndex;
+            } else {
+                printIndex = -1;
+            }
+        }
+    });
+}
+
+
+/**
+ * 清空查询条件
+ */
+function cleanParams() {
+    $('#reportrange span').html(moment().format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    $("#printNum").val(null);
+    $('#cashParam').empty();
+    $('#cashParam').selectpicker('refresh');
+    $('#rjList').empty();
+    $('#rjList').selectpicker('refresh');
+
+}
+
+/**
+ * 打印报表
+ */
+function print() {
+    setPrint();
+    LODOP = getLodop();
+    LODOP.PRINT_INITA(6, 0, "210mm", "297mm", "门诊收费收入日报表");
+    //设置默认打印机
+    LODOP.SET_PRINTER_INDEX(printIndex);
+    LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "297mm");
+    LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "210mm");
+    LODOP.ADD_PRINT_HTM("0mm", "0mm", "210mm", "297mm", document.getElementById("printDiv").innerHTML);
+    LODOP.PRINT();
+}
+
+
+/**
+ * 日期改变事件
+ * @param callback 回调函数
+ */
+function daterangepicker(callback) {
+
+    if (typeof ($.fn.daterangepicker) === 'undefined') {
+        return;
+    }
+    console.log('init_daterangepicker');
+
+    var cb = function (start, end, label) {
+        console.log(start.toISOString(), end.toISOString(), label);
+        $('#reportrange span').html(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+        callback();
+    };
+    var optionSet1 = {
+        //startDate: moment().subtract(29, 'days'),
+        startDate: moment(),
+        endDate: moment(),
+        minDate: '2012-01-01',
+        maxDate: nowString(),
+        dateLimit: {
+            days: 60
+        },
+        showDropdowns: true,
+        showWeekNumbers: true,
+        timePicker: false,
+        timePickerIncrement: 1,
+        timePicker12Hour: true,
+        ranges: {
+            '今天': [moment(), moment()],
+            '昨天': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+            '最近7天': [moment().subtract(6, 'days'), moment()],
+            '最近30天': [moment().subtract(29, 'days'), moment()],
+            '当月': [moment().startOf('month'), moment().endOf('month')],
+            '上个月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        },
+        opens: 'left',
+        buttonClasses: ['btn btn-default'],
+        applyClass: 'btn-small btn-primary',
+        cancelClass: 'btn-small',
+        format: 'YYYY-MM-DD',
+        separator: ' to ',
+        locale: {
+            applyLabel: '确定',
+            cancelLabel: '取消',
+            fromLabel: 'From',
+            toLabel: 'To',
+            customRangeLabel: '自定义',
+            daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+            monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+            firstDay: 1
+        }
+    };
+
+    //$('#reportrange span').html(moment().subtract(29, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    $('#reportrange span').html(moment().format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    $('#reportrange').daterangepicker(optionSet1, cb);
+    $('#reportrange').on('show.daterangepicker', function () {
+        console.log("show event fired");
+    });
+    $('#reportrange').on('hide.daterangepicker', function () {
+        console.log("hide event fired");
+    });
+    $('#reportrange').on('apply.daterangepicker', function (ev, picker) {
+        console.log("apply event fired, start/end dates are " + picker.startDate.format('YYYY-MM-DD') + " to " + picker.endDate.format('YYYY-MM-DD'));
+    });
+    $('#reportrange').on('cancel.daterangepicker', function (ev, picker) {
+        console.log("cancel event fired");
+    });
+    $('#options1').click(function () {
+        $('#reportrange').data('daterangepicker').setOptions(optionSet1, cb);
+    });
+    $('#options2').click(function () {
+        $('#reportrange').data('daterangepicker').setOptions(optionSet2, cb);
+    });
+    $('#destroy').click(function () {
+        $('#reportrange').data('daterangepicker').remove();
+    });
+
+}
+
+
+/**
+ * 查询给定日期内收费员列表
+ */
+function getAllOperator() {
+    var rePortRangeArr = getRePortRangeArr();
+    $.ajax({
+        type: "POST",
+        url: '/thmz/getAllOperator',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        data: JSON.stringify({"beginDate": rePortRangeArr[0], "endDate": rePortRangeArr[1]}),
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var html = '';
+                $.each(res.employees, function (commentIndex, comment) {
+                    html += '<option value="' + comment.employeeCode + '">' + comment.employeeName + '</option>';
+                });
+                $('#cashParam').empty();
+                $('#cashParam').html(html);
+                $('#cashParam').selectpicker('refresh');
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+/**
+ * 查询可以被重打结算列表用户与日期列表
+ */
+function getDcountDateList() {
+    var rePortRangeArr = getRePortRangeArr();
+    $.ajax({
+        type: "POST",
+        url: '/thmz/getDcountDateList',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        data: JSON.stringify({
+            "beginDate": rePortRangeArr[0],
+            "endDate": rePortRangeArr[1],
+            "opId": $('#cashParam').val()
+        }),
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var html = '';
+                $.each(res.dcountDateListVos, function (commentIndex, comment) {
+                    html += '<option value="' + comment.dcountDateStr + '">' + comment.dcountDateStr + '</option>';
+                });
+                $('#rjList').empty();
+                $('#rjList').html(html);
+                $('#rjList').selectpicker('refresh');
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}

+ 0 - 5
src/main/resources/templates/daily.html

@@ -53,11 +53,6 @@
                                     title="重置"><i class="fa fa-rotate-left"></i>
                             </button>
                         </div>
-                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
-                            <button type="button" style="margin-left:3px" id="btn_query" class="btn btn-primary"
-                                    title="查询"><i class="fa fa-search"></i>
-                            </button>
-                        </div>
                         <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
                             <button type="button" style="margin-left:3px" id="btn_daily" class="btn btn-primary"
                                     title="结账处理">结账处理

+ 673 - 0
src/main/resources/templates/daily_repeat_print.html

@@ -0,0 +1,673 @@
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
+<link rel="stylesheet" href="/thmz/css/custom.min.css">
+<link rel="stylesheet" href="/thmz/css/toll_administration.css">
+<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/daily_repeat_print.js"></script>
+<script src="/thmz/js/LodopFuncs.js"></script>
+<!-- 打印的样式-->
+<style media="print">
+    @page {
+        size: auto;
+        margin: 0mm;
+    }
+</style>
+<style>
+    .receipt {
+        padding-left: 40px;
+    }
+</style>
+<div class="row">
+    <div class="col-md-12 col-sm-12 col-xs-12">
+        <div class="x_panel">
+            <div class="panel-body">
+                <form id="formSearch" class="form-horizontal" autocomplete="off">
+                    <div class="btn-group col-md-4 col-sm-4 col-xs-12" id="pay_mark_group">
+                        <button class="btn btn-sm btn-primary" type="button" onclick="reportButtonChange(this)">&nbsp;&nbsp;日结报表&nbsp;&nbsp;
+                        </button>
+                        <button class="btn btn-sm btn-default" type="button" onclick="reportButtonChange(this)">&nbsp;&nbsp;收费清单&nbsp;&nbsp;
+                        </button>
+                        <button class="btn btn-sm btn-default" type="button" onclick="reportButtonChange(this)">&nbsp;&nbsp;挂号清单&nbsp;&nbsp;
+                        </button>
+                    </div>
+                    <div class="form-group col-md-8 col-sm-8 col-xs-12">
+                        <!--<div class="col-md-6 col-sm-6 col-xs-12"></div>-->
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="reportrange"> 日结时间
+                        </label>
+                        <div class="col-md-3 col-sm-3 col-xs-12">
+                            <div id="reportrange" class="pull-right"
+                                 style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
+                                <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
+                                <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
+                            </div>
+                        </div>
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="cashParam">收费员
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
+                            <select class="form-control selectpicker show-tick" data-live-search="true" title="请选择"
+                                    id="cashParam" onchange="getDcountDateList()">
+                            </select>
+                        </div>
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="rjList">日结列表
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
+                            <select class="form-control selectpicker show-tick" data-live-search="true" title="请选择"
+                                    id="rjList" onchange="initFeeTable()">
+                            </select>
+                        </div>
+                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
+                            <button type="button" style="margin-left:20px" id="btn_clean" class="btn btn-primary"
+                                    title="重置"><i class="fa fa-rotate-left"></i>
+                            </button>
+                        </div>
+                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
+                            <button type="button" style="margin-left:3px" id="btn_daily" class="btn btn-primary"
+                                    title="打印">打印
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div id="report_table" class="in"
+                 style="width:920px;height:700px;margin:0 auto;border: 1px solid #337ab7;font-size: 16px;padding: 40px 20px 40px 20px;overflow-y: auto; overflow-x:hidden;">
+                <h2 style="text-align:center;font-weight: 700;">门诊收费收入日报表</h2>
+                <div style="margin-top: 20px;"><span>工号:</span><span id="userIdCode"></span><span
+                        style="margin-left: 120px;">姓名:</span><span id="username"></span><span
+                        style="margin-left: 120px;">结账时间:</span><span id="dcountDate"></span></div>
+                <table class="table table-striped table-bordered">
+                    <tbody>
+                    <tr>
+                        <td>挂号费</td>
+                        <td id="charge1">0.00</td>
+                        <td>其他</td>
+                        <td id="charge9">0.00</td>
+                        <td>消毒费</td>
+                        <td id="charge16">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>床位费</td>
+                        <td id="charge2">0.00</td>
+                        <td>西药费</td>
+                        <td id="charge10">0.00</td>
+                        <td>材料费</td>
+                        <td id="charge18">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>诊查费</td>
+                        <td id="charge3">0.00</td>
+                        <td>中成药费</td>
+                        <td id="charge11">0.00</td>
+                        <td>麻醉费</td>
+                        <td id="charge19">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>检查费</td>
+                        <td id="charge4">0.00</td>
+                        <td>中草药费</td>
+                        <td id="charge12">0.00</td>
+                        <td>四舍五入</td>
+                        <td id="charge20">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>治疗费</td>
+                        <td id="charge5">0.00</td>
+                        <td>特殊材料费</td>
+                        <td id="charge13">0.00</td>
+                        <td>护理费</td>
+                        <td id="charge6">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>输血费</td>
+                        <td id="charge14">0.00</td>
+                        <td>手术费</td>
+                        <td id="charge7">0.00</td>
+                        <td>鉴定费</td>
+                        <td id="charge15">0.00</td>
+                    </tr>
+                    <tr>
+                        <td>化验费</td>
+                        <td id="charge8">0.00</td>
+                        <td>手术器械使用费</td>
+                        <td id="charge17">0.00</td>
+                        <td>合计:</td>
+                        <td id="totalCharge">0.00</td>
+                    </tr>
+                    </tbody>
+                </table>
+                <table id="datatable" class="table table-striped table-bordered">
+                    <thead>
+                    <tr>
+                        <th rowspan="2" class="text-center" style="vertical-align: middle !important;">交易类别</th>
+                        <th colspan="2" class="text-center">收款</th>
+                        <th colspan="2" class="text-center">退款</th>
+                        <th colspan="2" class="text-center">实收</th>
+                    </tr>
+                    <tr>
+                        <th class="text-center">张数</th>
+                        <th class="text-center">金额</th>
+                        <th class="text-center">张数</th>
+                        <th class="text-center">金额</th>
+                        <th class="text-center">张数</th>
+                        <th class="text-center">金额</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="text-center">现金</td>
+                        <td id="xjbs">0</td>
+                        <td id="xjsk">0.00</td>
+                        <td id="xjtfbs">0</td>
+                        <td id="xjtf">0.00</td>
+                        <td id="xjssbs">0</td>
+                        <td id="xjss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">银行卡</td>
+                        <td id="yhsbs">0</td>
+                        <td id="yhksk">0.00</td>
+                        <td id="yhktfbs">0</td>
+                        <td id="yhktf">0.00</td>
+                        <td id="yhkssbs">0</td>
+                        <td id="yhkss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">支付宝</td>
+                        <td id="zfbbs">0</td>
+                        <td id="zfbsk">0.00</td>
+                        <td id="zfbtfbs">0</td>
+                        <td id="zfbtf">0.00</td>
+                        <td id="zfbssbs">0</td>
+                        <td id="zfbss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">微信</td>
+                        <td id="wxbs">0</td>
+                        <td id="wxsk">0.00</td>
+                        <td id="wxtfbs">0</td>
+                        <td id="wxtf">0.00</td>
+                        <td id="wxssbs">0</td>
+                        <td id="wxss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">记账绿色通道</td>
+                        <td id="zfbs">0</td>
+                        <td id="zfsk">0.00</td>
+                        <td id="zftfbs">0</td>
+                        <td id="zftf">0.00</td>
+                        <td id="zfssbs">0</td>
+                        <td id="zfss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">医保卡</td>
+                        <td id="sybbs">0</td>
+                        <td id="sybksk">0.00</td>
+                        <td id="sybtfbs">0</td>
+                        <td id="sybtf">0.00</td>
+                        <td id="sybssbs">0</td>
+                        <td id="sybkss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center">总计</td>
+                        <td id="zjbs">0</td>
+                        <td id="zjsk">0.00</td>
+                        <td id="ztfbs">0</td>
+                        <td id="zjtk">0.00</td>
+                        <td id="zjssbs">0</td>
+                        <td id="zjss">0.00</td>
+                    </tr>
+                    <tr>
+                        <td class="text-center" colspan="2">实缴合计</td>
+                        <td id="sjhj">0.00</td>
+                        <td colspan="4" id="sjhjdx"></td>
+                    </tr>
+                    <tr>
+                        <td class="text-center" colspan="2">记账(绿色通道)</td>
+                        <td id="zfsshj">0.00</td>
+                        <td colspan="4" id="zfdx"></td>
+                    </tr>
+                    <tr>
+                        <td class="text-center" colspan="2">总计</td>
+                        <td id="zj">0.00</td>
+                        <td colspan="4" id="zjdx"></td>
+                    </tr>
+                    </tbody>
+                </table>
+                <div class="form-group col-md-12 col-sm-12 col-xs-12" id="sfReceiptBills">
+                    <div class="col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 10px;">所用票号:</div>
+                </div>
+                <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                    <div class="col-md-12 col-sm-12 col-xs-12" style="border-bottom: 0.5px solid #dcdcdc;">
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="margin-left: -10px;">发票张数:</div>
+                        <div class="col-md-1 col-sm-1 col-xs-12" id="sffps">0</div>
+                        <div class="col-md-2 col-sm-2 col-xs-12">退票张数:</div>
+                        <div class="col-md-1 col-sm-1 col-xs-12" id="tpzs">0</div>
+                        <div class="col-md-2 col-sm-2 col-xs-12">作废张数:</div>
+                        <div class="col-md-1 col-sm-1 col-xs-12" id="zffps">0</div>
+                    </div>
+                    <table style="display: none" id="sfzffpmx_table">
+                        <thead>
+                        <tr>
+                            <td colspan="9">作废/退费明细表:</td>
+                        </tr>
+                        <tr>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                        </tr>
+                        </thead>
+                        <tbody id="sfzffpmx">
+
+                        </tbody>
+                    </table>
+                </div>
+                <h2 style="text-align:center;font-weight: 700">门诊挂号收入个人日报表</h2>
+                <div style="margin-top: 20px;"><span>工号:</span><span id="userIdCode_gh"></span><span
+                        style="margin-left: 120px;">姓名:</span><span id="username_gh"></span><span
+                        style="margin-left: 120px;">结账时间:</span><span id="dcountDate_gh"></span></div>
+                <table class="table table-striped table-bordered">
+                    <tbody>
+                    <tr>
+                        <td>项目</td>
+                        <td>金额</td>
+                        <td colspan="3" class="text-center">使用票据及费用构成</td>
+                    </tr>
+                    <tr>
+                        <td rowspan="3" style="vertical-align: middle !important;">挂号</td>
+                        <td rowspan="3" style="vertical-align: middle !important;" id="ghje">0.00</td>
+                        <td colspan="3" id="ghfps">所用票数:0</td>
+                    </tr>
+                    <tr>
+                        <td id="qmhs">全免号数:0</td>
+                        <td id="jzhs">记账号数:0</td>
+                        <td id="jzje">记账金额:0</td>
+                    </tr>
+                    <tr>
+                        <td id="zcsr">诊察收入:0.00</td>
+                        <td id="jcsr">检查收入:0.00</td>
+                        <td id="ghsr">挂号费(门诊):0.00</td>
+                    </tr>
+                    <tr>
+                        <td>退号</td>
+                        <td id="thje">0.00</td>
+                        <td colspan="3" id="ghtpzs">退票数:0</td>
+                    </tr>
+                    <tr>
+                        <td>合计(小写)</td>
+                        <td colspan="2" id="ghhj">0.00</td>
+                        <td colspan="2" id="ghjebhjz">合计(不含记账) 0.00</td>
+                    </tr>
+                    <tr>
+                        <td>合计(大写)</td>
+                        <td colspan="2" id="ghhjdx"></td>
+                        <td colspan="2" id="ghjebhjzdx">合计(不含记账)</td>
+                    </tr>
+                    </tbody>
+                </table>
+                <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 50px;">
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12"
+                         style="border-bottom: 0.5px solid #dcdcdc;" id="ghReceiptBills">
+                        <div class="col-md-12 col-sm-12 col-xs-12" style="">所用票号:</div>
+                    </div>
+                    <table style="display: none" id="thzffpmx_table">
+                        <thead>
+                        <tr>
+                            <td colspan="9">作废/退号明细表:</td>
+                        </tr>
+                        <tr>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                            <td width="114.8px">发票号</td>
+                            <td width="100px">姓名</td>
+                            <td width="72.2px">金额</td>
+                        </tr>
+                        </thead>
+                        <tbody id="thzffpmx">
+
+                        </tbody>
+                    </table>
+                </div>
+
+                <div><span>制表人:</span><span style="text-decoration: underline" id="username_zbr"></span><span
+                        style="margin-left: 120px;">收款人:</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
+                        style="margin-left: 120px;">审核人:</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                </div>
+
+
+                <div id="printDiv" style="display: none">
+                    <h2 style="text-align:center;font-weight: 700;">门诊收费收入日报表</h2>
+                    <div style="margin-top: 20px;"><span>工号:</span><span id="userIdCode_p"></span><span
+                            style="margin-left: 120px;">姓名:</span><span id="username_p"></span><span
+                            style="margin-left: 120px;">结账时间:</span><span id="dcountDate_p"></span></div>
+                    <table border="1" cellspacing="0" style="width: 96%;">
+                        <tbody>
+                        <tr>
+                            <td>挂号费</td>
+                            <td id="charge1_p">0.00</td>
+                            <td>其他</td>
+                            <td id="charge9_p">0.00</td>
+                            <td>消毒费</td>
+                            <td id="charge16_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>床位费</td>
+                            <td id="charge2_p">0.00</td>
+                            <td>西药费</td>
+                            <td id="charge10_p">0.00</td>
+                            <td>材料费</td>
+                            <td id="charge18_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>诊查费</td>
+                            <td id="charge3_p">0.00</td>
+                            <td>中成药费</td>
+                            <td id="charge11_p">0.00</td>
+                            <td>麻醉费</td>
+                            <td id="charge19_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>检查费</td>
+                            <td id="charge4_p">0.00</td>
+                            <td>中草药费</td>
+                            <td id="charge12_p">0.00</td>
+                            <td>四舍五入</td>
+                            <td id="charge20_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>治疗费</td>
+                            <td id="charge5_p">0.00</td>
+                            <td>特殊材料费</td>
+                            <td id="charge13_p">0.00</td>
+                            <td>护理费</td>
+                            <td id="charge6_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>输血费</td>
+                            <td id="charge14_p">0.00</td>
+                            <td>手术费</td>
+                            <td id="charge7_p">0.00</td>
+                            <td>鉴定费</td>
+                            <td id="charge15_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td>化验费</td>
+                            <td id="charge8_p">0.00</td>
+                            <td>手术器械使用费</td>
+                            <td id="charge17_p">0.00</td>
+                            <td>合计:</td>
+                            <td id="totalCharge_p">0.00</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <table id="datatable_p" border="1" cellspacing="0" style="width: 96%;margin-top: 20px;">
+                        <thead>
+                        <tr>
+                            <th rowspan="2" class="text-center" style="vertical-align: middle !important;">交易类别</th>
+                            <th colspan="2" class="text-center">收款</th>
+                            <th colspan="2" class="text-center">退款</th>
+                            <th colspan="2" class="text-center">实收</th>
+                        </tr>
+                        <tr>
+                            <th class="text-center">张数</th>
+                            <th class="text-center">金额</th>
+                            <th class="text-center">张数</th>
+                            <th class="text-center">金额</th>
+                            <th class="text-center">张数</th>
+                            <th class="text-center">金额</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <td class="text-center">现金</td>
+                            <td id="xjbs_p">0</td>
+                            <td id="xjsk_p">0.00</td>
+                            <td id="xjtfbs_p">0</td>
+                            <td id="xjtf_p">0.00</td>
+                            <td id="xjssbs_p">0</td>
+                            <td id="xjss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">银行卡</td>
+                            <td id="yhsbs_p">0</td>
+                            <td id="yhksk_p">0.00</td>
+                            <td id="yhktfbs_p">0</td>
+                            <td id="yhktf_p">0.00</td>
+                            <td id="yhkssbs_p">0</td>
+                            <td id="yhkss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">支付宝</td>
+                            <td id="zfbbs_p">0</td>
+                            <td id="zfbsk_p">0.00</td>
+                            <td id="zfbtfbs_p">0</td>
+                            <td id="zfbtf_p">0.00</td>
+                            <td id="zfbssbs_p">0</td>
+                            <td id="zfbss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">微信</td>
+                            <td id="wxbs_p">0</td>
+                            <td id="wxsk_p">0.00</td>
+                            <td id="wxtfbs_p">0</td>
+                            <td id="wxtf_p">0.00</td>
+                            <td id="wxssbs_p">0</td>
+                            <td id="wxss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">记账绿色通道</td>
+                            <td id="zfbs_p">0</td>
+                            <td id="zfsk_p">0.00</td>
+                            <td id="zftfbs_p">0</td>
+                            <td id="zftf_p">0.00</td>
+                            <td id="zfssbs_p">0</td>
+                            <td id="zfss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">医保卡</td>
+                            <td id="sybbs_p">0</td>
+                            <td id="sybksk_p">0.00</td>
+                            <td id="sybtfbs_p">0</td>
+                            <td id="sybtf_p">0.00</td>
+                            <td id="sybssbs_p">0</td>
+                            <td id="sybkss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center">总计</td>
+                            <td id="zjbs_p">0</td>
+                            <td id="zjsk_p">0.00</td>
+                            <td id="ztfbs_p">0</td>
+                            <td id="zjtk_p">0.00</td>
+                            <td id="zjssbs_p">0</td>
+                            <td id="zjss_p">0.00</td>
+                        </tr>
+                        <tr>
+                            <td class="text-center" colspan="2">实缴合计</td>
+                            <td id="sjhj_p">0.00</td>
+                            <td colspan="4" id="sjhjdx_p"></td>
+                        </tr>
+                        <tr>
+                            <td class="text-center" colspan="2">记账(绿色通道)</td>
+                            <td id="zfsshj_p">0.00</td>
+                            <td colspan="4" id="zfdx_p"></td>
+                        </tr>
+                        <tr>
+                            <td class="text-center" colspan="2">总计</td>
+                            <td id="zj_p">0.00</td>
+                            <td colspan="4" id="zjdx_p"></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" id="sfReceiptBills_p"
+                         style="margin-bottom: 10px;margin-top: 20px;padding-left: 20px;">
+
+                        <table>
+                            <thead>
+                            <tr>
+                                <td colspan="4">所用票号:</td>
+                            <tr>
+                                <td width="215px"></td>
+                                <td width="215px"></td>
+                                <td width="215px"></td>
+                                <td width="215px"></td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="sfReceiptBills_p_table">
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                        <div class="col-md-12 col-sm-12 col-xs-12"
+                             style="border-bottom: 0.5px solid #dcdcdc;padding-left: 20px;">
+                            <table style="width: 60%;">
+                                <tbody>
+                                <tr>
+                                    <td>发票张数:</td>
+                                    <td id="sffps_p">0</td>
+                                    <td>退票张数:</td>
+                                    <td id="tpzs_p">0</td>
+                                    <td>作废张数:</td>
+                                    <td id="zffps_p">0</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="sfzffpmx_p_table">
+                            <thead>
+                            <tr>
+                                <td colspan="9">作废/退费明细表:</td>
+                            </tr>
+                            <tr>
+                            <tr>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="sfzffpmx_p">
+
+                            </tbody>
+                        </table>
+                    </div>
+                    <h2 style="text-align:center;font-weight: 700">门诊挂号收入个人日报表</h2>
+                    <div style="margin-top: 20px;"><span>工号:</span><span id="userIdCode_gh_p"></span><span
+                            style="margin-left: 120px;">姓名:</span><span id="username_gh_p"></span><span
+                            style="margin-left: 120px;">结账时间:</span><span id="dcountDate_gh_p"></span></div>
+                    <table border="1" style="width: 96%;" cellspacing="0">
+                        <tbody>
+                        <tr>
+                            <td>项目</td>
+                            <td>金额</td>
+                            <td colspan="3" class="text-center">使用票据及费用构成</td>
+                        </tr>
+                        <tr>
+                            <td rowspan="3" style="vertical-align: middle !important;">挂号</td>
+                            <td rowspan="3" style="vertical-align: middle !important;" id="ghje_p">0.00</td>
+                            <td colspan="3" id="ghfps_p">所用票数:0</td>
+                        </tr>
+                        <tr>
+                            <td id="qmhs_p">全免号数:0</td>
+                            <td id="jzhs_p">记账号数:0</td>
+                            <td id="jzje_p">记账金额:0</td>
+                        </tr>
+                        <tr>
+                            <td id="zcsr_p">诊察收入:0.00</td>
+                            <td id="jcsr_p">检查收入:0.00</td>
+                            <td id="ghsr_p">挂号费(门诊):0.00</td>
+                        </tr>
+                        <tr>
+                            <td>退号</td>
+                            <td id="thje_p">0.00</td>
+                            <td colspan="3" id="ghtpzs_p">退票数:0</td>
+                        </tr>
+                        <tr>
+                            <td>合计(小写)</td>
+                            <td colspan="2" id="ghhj_p">0.00</td>
+                            <td colspan="2" id="ghjebhjz_p">合计(不含记账) 0.00</td>
+                        </tr>
+                        <tr>
+                            <td>合计(大写)</td>
+                            <td colspan="2" id="ghhjdx_p"></td>
+                            <td colspan="2" id="ghjebhjzdx_p">合计(不含记账)</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 50px;">
+                        <div class="form-group col-md-12 col-sm-12 col-xs-12"
+                             style="border-bottom: 0.5px solid #dcdcdc;margin-bottom: 10px;margin-top: 20px;padding-left: 20px;"
+                             id="ghReceiptBills_p">
+                            <table>
+                                <thead>
+                                <tr>
+                                    <td colspan="4">所用票号:</td>
+                                <tr>
+                                    <td width="215px"></td>
+                                    <td width="215px"></td>
+                                    <td width="215px"></td>
+                                    <td width="215px"></td>
+                                </tr>
+                                </tr>
+                                </thead>
+                                <tbody id="ghReceiptBills_p_table">
+                                </tbody>
+                            </table>
+                        </div>
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="thzffpmx_table_p">
+                            <thead>
+                            <tr>
+                                <td colspan="9">作废/退号明细表:</td>
+                            </tr>
+                            <tr>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                                <td width="114.8px">发票号</td>
+                                <td width="100px">姓名</td>
+                                <td width="72.2px">金额</td>
+                            </tr>
+                            </thead>
+                            <tbody id="thzffpmx_p">
+
+                            </tbody>
+                        </table>
+                    </div>
+                    <div><span>制表人:</span><span style="text-decoration: underline" id="username_zbr_p"></span><span
+                            style="margin-left: 120px;">收款人:</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
+                            style="margin-left: 120px;">审核人:</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    </div>
+                </div>
+            </div>
+            <table id="tb_table"></table>
+            <div id="previewImage">
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
+    <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
+</object>
+

+ 1 - 1
src/main/resources/templates/menu.html

@@ -67,8 +67,8 @@
                                 <ul class="nav child_menu">
                                     <li><a href="#" onclick="changeContent('/thmz/toll-administration')">收费退费</a></li>
                                     <li><a href="#" onclick="changeContent('/thmz/daily')">日结处理</a></li>
+                                    <li><a href="#" onclick="changeContent('/thmz/daily-repeat-print')">重打日结报表</a></li>
                                     <li><a href="#" onclick="changeContent('/thmz/toll-administration')">日结汇总</a></li>
-                                    <li><a href="#" onclick="changeContent('/thmz/toll-administration')">重打日结报表</a></li>
                                 </ul>
                             </li>
                             <li><a><i class="fa fa-table"></i> 列表管理 <span class="fa fa-chevron-down"></span></a>