nxwj/dzpt
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update：初版对账

Browse Source
This commit is contained in:
Yuan
2025-09-17 11:20:06 +08:00
parent e2959b738b
commit e63ace40fd
6 changed files with 49 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java
View File

@@ -92,8 +92,8 @@ public class HISGetDataMethodByJH {
calendar.add(Calendar.DATE, -1);
Date time = calendar.getTime();
// startTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, time) + " 00:00:00";
// endTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, new Date()) + " 00:00:00";
startTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, time) + " 00:00:00";
endTime = DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, new Date()) + " 00:00:00";
trade_date=DateDUtil.DateToStr(DateDUtil.yyyy_MM_dd, time);
}else {
startTime = trade_date + " 00:00:00";
@@ -105,8 +105,8 @@ public class HISGetDataMethodByJH {
}
//组织request
startTime="2024-08-06 15:33:12";
endTime="2024-08-07 15:33:12";
// startTime="2024-08-06 15:33:12";
// endTime="2024-08-07 15:33:12";
String requestStr="";
requestStr="<Request>" +
" <HisOperNum>"+ operatorsCodeStr +"</HisOperNum>" +

9
src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
View File

@@ -8,6 +8,8 @@ import com.saye.hospitalgd.service.*;
import com.saye.hospitalgd.service.historyLog.ReconciliationLogService;
import com.saye.hospitalgd.service.historyLog.impl.ReconciliationLogServiceImpl;
import com.saye.hospitalgd.service.impl.*;
import com.saye.hospitalgd.service.system.ServiceParamsService;
import com.saye.hospitalgd.service.system.impl.ServiceParamsServiceImpl;
import java.math.BigDecimal;
@@ -41,7 +43,7 @@ public class ReconciliationMethod {
ReconciliationLogService reconciliationLogService = GetBeanUtil.getBean(ReconciliationLogServiceImpl.class);
// ServiceParamsService serviceParamsService = GetBeanUtil.getBean(ServiceParamsServiceImpl.class);
ServiceParamsService serviceParamsService = GetBeanUtil.getBean(ServiceParamsServiceImpl.class);
HisbillsHistoryService hisbillsHistoryService = GetBeanUtil.getBean(HisbillsHistoryServiceImpl.class);
@@ -72,8 +74,10 @@ public class ReconciliationMethod {
TransactionDetailService transactionDetailService = GetBeanUtil.getBean(TransactionDetailServiceImpl.class);
UnilateralService unilateralService = GetBeanUtil.getBean(UnilateralServiceImpl.class);
String cash_code = StringDUtil.changeNullToEmpty(serviceParamsService.findParamValByParamCode("cash_code"));
//先创建关联表 用来后面查询交易明细
// searchMap.put("cash_code", cash_code);
searchMap.put("cash_code", cash_code);
transactionDetailService.insertHisAndThirdJoinData(searchMap);
@@ -458,6 +462,7 @@ public class ReconciliationMethod {
searchNotUniqueObjMap.put("orderby_je", "true");
//todo
//his端重复记录
List<HashMap<Object, Object>> list = hisbillsHistoryService.findHisDetailByParam(searchNotUniqueObjMap);
// hisDetailService.findHisDetailByParam(searchNotUniqueObjMap);