报表清洗功能去除

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

@@ -461,7 +461,7 @@ public class ChargeFeeVoController {
         try {
             User tokenUser = TokenUtil.getUser(httpServletRequest);
 //            //数据清洗，将已经做了日结的发票数据清洗,
-            chargeFeeVoService.setPayId();
+//            chargeFeeVoService.setPayId();
             //挂号收入构成表格数据
             ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(tokenUser.getUserIdCode(), null, null, null).get(0);
             reqrecVo.fomartReqrecVo();
@@ -562,7 +562,7 @@ public class ChargeFeeVoController {
                 return resultMap;
             }
             //数据清洗，将在老系统日结的数据清洗一次
-            chargeFeeVoService.refeshPayManData(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+      //      chargeFeeVoService.refeshPayManData(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
             User tokenUser = userService.queryUserByUserIdCode(chargeFeeParamsVo.getOpId());
             resultMap.put("user", tokenUser);
             //挂号收入构成表格数据
@@ -665,23 +665,23 @@ public class ChargeFeeVoController {
                 return resultMap;
             }
 
-            List<String> operaotors = chargeFeeVoService.queryAllOperatorFromReceipt(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
-            List<String> ghOperaotors = chargeFeeVoService.queryAllOperatorFromReqrec(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
-            ghOperaotors.forEach(o -> {
-                if (!operaotors.contains(o)) {
-                    operaotors.add(o);
-                }
-            });
-            List<DcountDateListVo> dcountDateListVos = new ArrayList<>();
-            for (String opId : ghOperaotors) {
-                dcountDateListVos.addAll(chargeFeeVoService.queryDcountDateList(opId, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
-            }
-
-            for (DcountDateListVo ddv : dcountDateListVos) {
-                //数据清洗，将在老系统日结的数据清洗一次
-                chargeFeeVoService.refeshPayManData(ddv.getOperatorId(), ddv.getDcountDate());
-            }
-            chargeFeeVoService.refeshInconformityData(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
+//            List<String> operaotors = chargeFeeVoService.queryAllOperatorFromReceipt(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
+//            List<String> ghOperaotors = chargeFeeVoService.queryAllOperatorFromReqrec(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
+//            ghOperaotors.forEach(o -> {
+//                if (!operaotors.contains(o)) {
+//                    operaotors.add(o);
+//                }
+//            });
+//            List<DcountDateListVo> dcountDateListVos = new ArrayList<>();
+//            for (String opId : ghOperaotors) {
+//                dcountDateListVos.addAll(chargeFeeVoService.queryDcountDateList(opId, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
+//            }
+//
+//            for (DcountDateListVo ddv : dcountDateListVos) {
+//                //数据清洗，将在老系统日结的数据清洗一次
+//                chargeFeeVoService.refeshPayManData(ddv.getOperatorId(), ddv.getDcountDate());
+//            }
+//            chargeFeeVoService.refeshInconformityData(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
 
             //挂号收入构成表格数据
             ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(null, null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()).get(0);

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

@@ -102,7 +102,7 @@ public interface ChargeFeeVoMapper {
             "  r.receipt_bill," +
             "   receipt_sn=r.receipt_sn , " +
             "   m.cheque_type, " +
-            "   m.op_id from mz_deposit_file  m left join mz_receipt_serial r on m.serial_no =r.serial_no where (r.receipt_bill <> '' and r.receipt_bill is not null) and " +
+            "   m.op_id from mz_deposit_file  m left join mz_receipt_serial r on m.serial_no =r.serial_no where  " +
             "   case '1' when #{caseType} then r.charge_date else  m.dcount_date end =#{dcountDate,jdbcType=TIMESTAMP}  " +
             "  and m.pay_mark <> 2 and m.cheque_type <>'Z' " +
             "  group by r.receipt_sn,r.receipt_bill,m.cheque_type,r.pay_mark,m.op_id " +

src/main/resources/static/js/registration.js

@@ -1656,7 +1656,7 @@ function clearRegistration() {
  */
 function prn1Print(patientId, times) {
     setPrint();
-    var height ="93.05mm";
+    var height ="93.08mm";
     // if(countReceiot%2==0){
     //     height ="93.2mm";
     // }

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

@@ -2019,7 +2019,7 @@ function clearRegistration() {
  */
 function prn1Print(patientId, times) {
     setPrint();
-    var height ="93.05mm";
+    var height ="93.08mm";
     // if(countReceiot%2==0){
     //     height ="93.2mm";
     // }

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

@@ -1365,7 +1365,7 @@ function obsoleteAndRepPrint(patientId, times, receiptNo) {
  */
 function printCommon(url, patientId, times, chargeFeeFlag) {
     setPrint();
-    var height = "93.05mm";
+    var height = "93.08mm";
     // if (countReceiot % 2 == 0) {
     //     height = "93.2mm";
     // }