|
|
@@ -356,8 +356,8 @@ public class ChargeFeeVoController {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
try {
|
|
|
User tokenUser = TokenUtil.getUser(httpServletRequest);
|
|
|
- //数据清洗，将已经做了日结的发票数据清洗,
|
|
|
- chargeFeeVoService.dataRefsh();
|
|
|
+// //数据清洗，将已经做了日结的发票数据清洗,
|
|
|
+// chargeFeeVoService.dataRefsh();
|
|
|
//挂号收入构成表格数据
|
|
|
ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(tokenUser.getUserIdCode(), null, null, null).get(0);
|
|
|
reqrecVo.fomartReqrecVo();
|
|
|
@@ -457,8 +457,8 @@ public class ChargeFeeVoController {
|
|
|
resultMap.put("message", "查询重打费用日结报表失败,结算时间为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- //数据清洗，将在老系统日结的数据清洗一次
|
|
|
- chargeFeeVoService.refeshPayManData();
|
|
|
+// //数据清洗，将在老系统日结的数据清洗一次
|
|
|
+// chargeFeeVoService.refeshPayManData();
|
|
|
User tokenUser = userService.queryUserByUserIdCode(chargeFeeParamsVo.getOpId());
|
|
|
resultMap.put("user", tokenUser);
|
|
|
//挂号收入构成表格数据
|
|
|
@@ -702,9 +702,9 @@ public class ChargeFeeVoController {
|
|
|
resultMap.put("message", "存在退费后发票未重打的发票信息，请 处理后再结账！");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- Date dcountDate = chargeFeeVoService.dcountCharge(tokenUser.getUserIdCode());
|
|
|
- resultMap.put("dcountDate", dcountDate);
|
|
|
- //resultMap.put("dcountDate", new Date());
|
|
|
+ // Date dcountDate = chargeFeeVoService.dcountCharge(tokenUser.getUserIdCode());
|
|
|
+ //resultMap.put("dcountDate", dcountDate);
|
|
|
+ resultMap.put("dcountDate", new Date());
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("message", "费用结算成功");
|
|
|
return resultMap;
|
hurugang