优化报表

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

@@ -563,6 +563,8 @@ public class ChargeFeeVoController {
             }
             //数据清洗，将在老系统日结的数据清洗一次
       //      chargeFeeVoService.refeshPayManData(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate());
+            //门诊部日结没有设置收费人id ，需要清洗
+            chargeFeeVoService.modifyMzService();
             User tokenUser = userService.queryUserByUserIdCode(chargeFeeParamsVo.getOpId());
             resultMap.put("user", tokenUser);
             //挂号收入构成表格数据
@@ -682,7 +684,8 @@ public class ChargeFeeVoController {
 //                chargeFeeVoService.refeshPayManData(ddv.getOperatorId(), ddv.getDcountDate());
 //            }
 //            chargeFeeVoService.refeshInconformityData(chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
-
+            //门诊部日结没有设置收费人id ，需要清洗
+            chargeFeeVoService.modifyMzService();
             //挂号收入构成表格数据
             ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(null, null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()).get(0);
             reqrecVo.fomartReqrecVo();

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

@@ -765,7 +765,7 @@ public interface ChargeFeeVoMapper {
      * @param dcountDate
      * @return
      */
-    @Update("update mz_receipt_serial set charge_dcount_no =1 , charge_dcount_date =#{dcountDate} where pay_id =#{userIdCode} and charge_dcount_no =0 ")
+    @Update("update mz_receipt_serial set charge_dcount_no =1 , charge_dcount_date =#{dcountDate} where pay_id =#{userIdCode} and (charge_dcount_no =0 or charge_dcount_no is null) ")
     int dcountReceiptChargeCount(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
     /**

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

@@ -275,5 +275,11 @@ public interface MzReceiptSerialMapper {
     @Update("update mz_receipt_serial set charge_dcount_date =#{chargeDcountDate},charge_dcount_no =#{chargeDcountNo} where serial_no=#{serialNo}")
     int updateMzReceiptSerialBySerialNo(MzReceiptSerial mzReceiptSerial);
 
+    /**
+     * 清洗门诊部数据
+     * @return
+     */
+    @Update("update mz_receipt_serial set pay_id =operator_id,charge_dcount_date=dcount_date,charge_dcount_no=dcount_no where operator_id in ('01893','01894','01895','01942') and (pay_id ='' or pay_id is null ) ")
+    int updateMzService();
 
 }

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

@@ -294,4 +294,12 @@ public interface ChargeFeeVoService {
      * @return
      */
     List<Map<String, Object>> queryThmzmxsr(ThmzmxsrParamsVo thmzmxsrParamsVo);
+
+
+
+    /**
+     * 清洗门诊部数据
+     * @return
+     */
+    int modifyMzService();
 }

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

@@ -238,4 +238,9 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
     public List<Map<String, Object>> queryThmzmxsr(ThmzmxsrParamsVo thmzmxsrParamsVo) {
         return chargeFeeVoMapper.selectThmzmxsr(thmzmxsrParamsVo);
     }
+
+    @Override
+    public int modifyMzService() {
+        return mzReceiptSerialMapper.updateMzService();
+    }
 }