报表优化

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

@@ -91,10 +91,10 @@ public class ChargeFeeVoController {
             for (ChargeFeeVo co : chargeFeeVos) {
                 PayMarkEnum payMark = PayMarkEnum.getPayMarkByCode(co.getPayMark());
                 co.setPayMark(payMark == null ? co.getPayMark() : payMark.name);
-                if(Constants.BRZZJF_CODE.equalsIgnoreCase(co.getOpId())){
-                    if(Constants.WX.equalsIgnoreCase(co.getChequeType())){
+                if (Constants.BRZZJF_CODE.equalsIgnoreCase(co.getOpId())) {
+                    if (Constants.WX.equalsIgnoreCase(co.getChequeType())) {
                         co.setChequeType(Constants.ZZWX);
-                    }else if(Constants.ZFB.equalsIgnoreCase(co.getChequeType())){
+                    } else if (Constants.ZFB.equalsIgnoreCase(co.getChequeType())) {
                         co.setChequeType(Constants.ZZZFB);
                     }
                 }
@@ -369,16 +369,16 @@ public class ChargeFeeVoController {
             chargeCountVo.fomartChargeCountVo();
             resultMap.put("chargeCountVo", chargeCountVo);
             //收费所用票号
-            List<ReceiptBillVo> sfReceipts=chargeFeeVoService.querySfReceiptBillVoUnAccount(tokenUser.getUserIdCode());
+            List<ReceiptBillVo> sfReceipts = chargeFeeVoService.querySfReceiptBillVoUnAccount(tokenUser.getUserIdCode());
             //挂号所用票号
-            List<ReceiptBillVo> ghReceipts=chargeFeeVoService.queryGhReceiptBillVoUnAccount(tokenUser.getUserIdCode());
+            List<ReceiptBillVo> ghReceipts = chargeFeeVoService.queryGhReceiptBillVoUnAccount(tokenUser.getUserIdCode());
             sfReceipts.addAll(ghReceipts);
             List<ReceiptBillVo> notFpList = new ArrayList<>();
-            sfReceipts.forEach(s->{
-                if(s.getReceiptBill()!=null && s.getReceiptBill().length()!=8){
+            sfReceipts.forEach(s -> {
+                if (s.getReceiptBill() != null && s.getReceiptBill().length() != 8) {
                     s.setReceiptBill(null);
                 }
-                if(s.getReceiptBill()==null || "00000000".equals(s.getReceiptBill())){
+                if (s.getReceiptBill() == null || "00000000".equals(s.getReceiptBill())) {
                     notFpList.add(s);
                 }
             });
@@ -387,27 +387,27 @@ public class ChargeFeeVoController {
             List<String> receiptBills = getStrings(sfReceipts);
             resultMap.put("receiptBills", receiptBills);
             Integer sffps = chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CHARGED.code, null);
-            Integer tpzs=chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.RETURN_PREMIUM.code, null);
-            Integer zffps=chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CANCELLATION.code, null);
-            Integer ghfps=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.NO.code.toString(), null, null, null);
-            Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.YES.code.toString(), null, null, null);
+            Integer tpzs = chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.RETURN_PREMIUM.code, null);
+            Integer zffps = chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CANCELLATION.code, null);
+            Integer ghfps = chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.NO.code.toString(), null, null, null);
+            Integer ghtpzs = chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.YES.code.toString(), null, null, null);
             //收费发票总数
-            resultMap.put("sffps",sffps+ghfps);
+            resultMap.put("sffps", sffps + ghfps);
             //退费发票张数
-            resultMap.put("tpzs", tpzs+ghtpzs);
+            resultMap.put("tpzs", tpzs + ghtpzs);
             //作废收费发票张数
             resultMap.put("zffps", zffps);
             //收费作废发票明细
-            List<ReceiptVo> sfzffpmx= chargeFeeVoService.queryReceiptVo(tokenUser.getUserIdCode(), null);
+            List<ReceiptVo> sfzffpmx = chargeFeeVoService.queryReceiptVo(tokenUser.getUserIdCode(), null);
             //退号发票明细
-            List<ReceiptVo> thzffpmx=chargeFeeVoService.queryThMzReceiptSerial(tokenUser.getUserIdCode(), null);
+            List<ReceiptVo> thzffpmx = chargeFeeVoService.queryThMzReceiptSerial(tokenUser.getUserIdCode(), null);
             sfzffpmx.addAll(thzffpmx);
             List<ReceiptVo> notFpGhList = new ArrayList<>();
-            sfzffpmx.forEach(s->{
-                if(s.getReceiptBill()!=null && s.getReceiptBill().length()!=8){
+            sfzffpmx.forEach(s -> {
+                if (s.getReceiptBill() != null && s.getReceiptBill().length() != 8) {
                     s.setReceiptBill(null);
                 }
-                if(s.getReceiptBill()==null || "00000000".equals(s.getReceiptBill())){
+                if (s.getReceiptBill() == null || "00000000".equals(s.getReceiptBill())) {
                     notFpGhList.add(s);
                 }
             });
@@ -456,6 +456,8 @@ public class ChargeFeeVoController {
                 resultMap.put("message", "查询重打费用日结报表失败,结算时间为空");
                 return resultMap;
             }
+            //数据清洗，将在老系统日结的数据清洗一次
+            chargeFeeVoService.refeshPayManData();
             User tokenUser = userService.queryUserByUserIdCode(chargeFeeParamsVo.getOpId());
             resultMap.put("user", tokenUser);
             //挂号收入构成表格数据
@@ -469,16 +471,16 @@ public class ChargeFeeVoController {
             chargeCountVo.fomartChargeCountVo();
             resultMap.put("chargeCountVo", chargeCountVo);
             //收费所用票号
-            List<ReceiptBillVo> sfReceipts=chargeFeeVoService.querySfReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+            List<ReceiptBillVo> sfReceipts = chargeFeeVoService.querySfReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
             //挂号所用票号
-            List<ReceiptBillVo> ghReceipts=chargeFeeVoService.queryGhReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+            List<ReceiptBillVo> ghReceipts = chargeFeeVoService.queryGhReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
             sfReceipts.addAll(ghReceipts);
             List<ReceiptBillVo> notFpList = new ArrayList<>();
-            sfReceipts.forEach(s->{
-                if(s.getReceiptBill()!=null && s.getReceiptBill().length()!=8){
+            sfReceipts.forEach(s -> {
+                if (s.getReceiptBill() != null && s.getReceiptBill().length() != 8) {
                     s.setReceiptBill(null);
                 }
-                if(s.getReceiptBill()==null || "00000000".equals(s.getReceiptBill())){
+                if (s.getReceiptBill() == null || "00000000".equals(s.getReceiptBill())) {
                     notFpList.add(s);
                 }
             });
@@ -487,32 +489,32 @@ public class ChargeFeeVoController {
             List<String> receiptBills = getStrings(sfReceipts);
             resultMap.put("receiptBills", receiptBills);
             //收费发票张数
-            Integer sffps=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CHARGED.code, chargeFeeParamsVo.getDcountDate());
+            Integer sffps = chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CHARGED.code, chargeFeeParamsVo.getDcountDate());
             //退费发票张数
-            Integer tpzs=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.RETURN_PREMIUM.code, chargeFeeParamsVo.getDcountDate());
+            Integer tpzs = chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.RETURN_PREMIUM.code, chargeFeeParamsVo.getDcountDate());
             //作废收费发票张数
-            Integer zffps=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CANCELLATION.code, chargeFeeParamsVo.getDcountDate());
+            Integer zffps = chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CANCELLATION.code, chargeFeeParamsVo.getDcountDate());
             //挂号发票张数
-            Integer ghfps=chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.NO.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
+            Integer ghfps = chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.NO.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
             //退号发票张数
-            Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
+            Integer ghtpzs = chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
             //收费发票总数
-            resultMap.put("sffps",sffps+ghfps);
+            resultMap.put("sffps", sffps + ghfps);
             //退费发票张数
-            resultMap.put("tpzs", tpzs+ghtpzs);
+            resultMap.put("tpzs", tpzs + ghtpzs);
             //作废收费发票张数
             resultMap.put("zffps", zffps);
             //收费作废发票明细
-            List<ReceiptVo> sfzffpmx= chargeFeeVoService.queryReceiptVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+            List<ReceiptVo> sfzffpmx = chargeFeeVoService.queryReceiptVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
             //退号发票明细
-            List<ReceiptVo> thzffpmx= chargeFeeVoService.queryThMzReceiptSerial(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+            List<ReceiptVo> thzffpmx = chargeFeeVoService.queryThMzReceiptSerial(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
             sfzffpmx.addAll(thzffpmx);
             List<ReceiptVo> notFpGhList = new ArrayList<>();
-            sfzffpmx.forEach(s->{
-                if(s.getReceiptBill()!=null && s.getReceiptBill().length()!=8){
+            sfzffpmx.forEach(s -> {
+                if (s.getReceiptBill() != null && s.getReceiptBill().length() != 8) {
                     s.setReceiptBill(null);
                 }
-                if(s.getReceiptBill()==null || "00000000".equals(s.getReceiptBill())){
+                if (s.getReceiptBill() == null || "00000000".equals(s.getReceiptBill())) {
                     notFpGhList.add(s);
                 }
             });
@@ -542,7 +544,7 @@ public class ChargeFeeVoController {
     public Map<String, Object> getFullChargeCollect(@RequestBody ChargeFeeParamsVo chargeFeeParamsVo, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-           // User tokenUser = TokenUtil.getUser(httpServletRequest);
+            // User tokenUser = TokenUtil.getUser(httpServletRequest);
             if (chargeFeeParamsVo == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询费用汇总报表失败,参数为空");
@@ -556,6 +558,8 @@ public class ChargeFeeVoController {
                 resultMap.put("message", "查询费用汇总报表失败,查询时间为空");
                 return resultMap;
             }
+            //数据清洗，将在老系统日结的数据清洗一次
+            chargeFeeVoService.refeshPayManData();
             //挂号收入构成表格数据
             ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(chargeFeeParamsVo.getOpId(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()).get(0);
             reqrecVo.fomartReqrecVo();
@@ -684,7 +688,7 @@ public class ChargeFeeVoController {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             User tokenUser = TokenUtil.getUser(httpServletRequest);
-            Integer count= chargeFeeVoService.queryCountCanDaily(tokenUser.getUserIdCode());
+            Integer count = chargeFeeVoService.queryCountCanDaily(tokenUser.getUserIdCode());
             if (count == null || count == 0) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "费用结算失败，无可结算费用");

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

@@ -876,4 +876,20 @@ public interface ChargeFeeVoMapper {
      */
     @Update("update mz_receipt_serial set charge_dcount_date =dcount_date,charge_dcount_no =dcount_no where operator_id = pay_id and (charge_dcount_date is null or charge_dcount_no =0)")
     int dataRefsh();
+
+
+
+    /**
+     * 数据清洗，将在老系统日结的普通收费员数据清洗一次
+     * @return
+     */
+    @Update("update mz_receipt_serial set pay_id =operator_id,charge_dcount_date=dcount_date,charge_dcount_no=dcount_no where operator_id <> '99999'  and (pay_id  is null or pay_id ='') ")
+    int refeshNomalPayManData();
+
+    /**
+     * 数据清洗，将在老系统日结的微信自助数据清洗一次
+     * @return
+     */
+    @Update("update mz_receipt_serial set charge_dcount_date=dcount_date,charge_dcount_no=dcount_no  where operator_id = '99999'  and (charge_dcount_date  is null or charge_dcount_date ='') ")
+    int refeshZzPayManData();
 }

src/main/java/cn/hnthyy/thmz/service/his/ChargeFeeVoService.java

@@ -265,4 +265,13 @@ public interface ChargeFeeVoService {
      * @return
      */
     int dataRefsh();
+
+
+
+
+    /**
+     * 数据清洗，将在老系统日结的数据清洗一次
+     * @return
+     */
+    int refeshPayManData();
 }

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

@@ -188,4 +188,10 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
     public int dataRefsh() {
         return chargeFeeVoMapper.dataRefsh();
     }
+
+    @Override
+    public int refeshPayManData() {
+        chargeFeeVoMapper.refeshNomalPayManData();
+        return chargeFeeVoMapper.refeshZzPayManData();
+    }
 }

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

@@ -409,7 +409,7 @@ function getRjbb() {
                 }else {
                     $(".zz_title").removeClass('in').addClass('hide');
                 }
-                $("#dcountDate").html(format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                $("#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));