Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml (revision 39062)
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
===================================================================
diff -u -r37971 -r39062
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 37971)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 39062)
@@ -536,9 +536,20 @@
@Override
public List findSyncOperationReservationByTime(Date startDate, Date endDate) {
List invoicePlanList = new ArrayList();
- if(invoicePlanDao != null){
- invoicePlanList = invoicePlanDao.findSyncOperationReservationByTimes(startDate,endDate);
+ if(invoicePlanDao2 != null){
+ try {
+ invoicePlanList = invoicePlanDao2.findSyncOperationReservationByTimes(startDate,endDate);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+ if(CollectionUtils.isEmpty(invoicePlanList) && invoicePlanDao != null){
+ try {
+ invoicePlanList = invoicePlanDao.findSyncOperationReservationByTimes(startDate,endDate);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
//过滤申请单
return filterSyncInvoicePlan(invoicePlanList,startDate,endDate);
}
@@ -552,9 +563,20 @@
List syncInvoicePlanList = new ArrayList();
List operationUseTousseItemList = new ArrayList();
//1.根据单号获得手术预约申请单VO
- if(invoicePlanDao != null){
- syncInvoicePlanList = invoicePlanDao.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ if(invoicePlanDao2 != null){
+ try {
+ syncInvoicePlanList = invoicePlanDao2.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+ if(CollectionUtils.isEmpty(syncInvoicePlanList) && invoicePlanDao != null){
+ try {
+ syncInvoicePlanList = invoicePlanDao.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
//2.根据同步手术预约单VO的手术名称获得使用器械包明细集合
if(CollectionUtils.isNotEmpty(syncInvoicePlanList)){
HrpInvoicePlan syncOperationReservation = syncInvoicePlanList.get(0);
@@ -571,9 +593,20 @@
JSONObject resultObject = new JSONObject();
List syncInvoicePlanList = new ArrayList();
//1.根据单号集合获得手术预约申请单VO
- if(invoicePlanDao != null){
- syncInvoicePlanList = invoicePlanDao.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ if(invoicePlanDao2 != null){
+ try {
+ syncInvoicePlanList = invoicePlanDao2.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+ if(CollectionUtils.isEmpty(syncInvoicePlanList) && invoicePlanDao != null){
+ try {
+ syncInvoicePlanList = invoicePlanDao.findSyncOperationReservationBySerialNumbers(serialNumberList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
//2.同步手术预约单
resultObject = syncAndSaveOperationReservation(syncInvoicePlanList);
return resultObject;
@@ -622,11 +655,25 @@
if(startTime.getTime().compareTo(endTime.getTime()) > 0 ){
throw new RuntimeException("开始过滤时间不能大于结束时间! 同步的过滤时间段为： "+startTime.getTime()+"至"+endTime.getTime());
}
- if(invoicePlanDao != null){
+ if(invoicePlanDao != null || invoicePlanDao2 != null){
List syncOperationReservationList = new ArrayList();
logger.info("开始手术预约申请单定时同步 :同步的过滤时间段为： "+startTime.getTime()+"至"+endTime.getTime());
//2 根据手术时间过滤获得:同步手术预约申请单VO的集合
- List operationReservationList = invoicePlanDao.findSyncOperationReservationByTimes(startTime.getTime(),endTime.getTime());
+ List operationReservationList = null;
+ if(invoicePlanDao2 != null){
+ try {
+ operationReservationList = invoicePlanDao2.findSyncOperationReservationByTimes(startTime.getTime(),endTime.getTime());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if(CollectionUtils.isEmpty(operationReservationList) && invoicePlanDao != null){
+ try {
+ operationReservationList = invoicePlanDao.findSyncOperationReservationByTimes(startTime.getTime(),endTime.getTime());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
//过滤已申请的申请单号
syncOperationReservationList = filterSyncInvoicePlan(operationReservationList,startTime.getTime(),endTime.getTime());
//3 开始同步
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/timer.xml
===================================================================
diff -u -r28754 -r39062
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/timer.xml (.../timer.xml) (revision 28754)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/timer.xml (.../timer.xml) (revision 39062)
@@ -42,6 +42,46 @@
0 0 3 * * ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+