diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java index f4e24e4..786b050 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.dal.IBasicConfigDao; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -39,6 +40,9 @@ public class SaveByV2ThreadPoolFacade { @Autowired private MongoTemplate mongoTemplate; + + @Autowired + private IBasicConfigDao basicConfigDao; /** * 保存历史数据,根据时间和医院id * @@ -70,6 +74,7 @@ public class SaveByV2ThreadPoolFacade { end = lists.size(); } Future f = commonThreadPool.submit(new SyncV2HistoryWorkerx(bookbuildingFacade, lists.subList(i, end), mongoTemplate, okSize, existSize, errorSize)); +// Future f = commonThreadPool.submit(new SyncV2HistoryWorkerx(bookbuildingFacade, lists.subList(i, end), mongoTemplate,basicConfigDao)); } } @@ -85,7 +90,7 @@ public class SaveByV2ThreadPoolFacade { } } } - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("同步结果: ok ===>" + okSize + "exist===>" + existSize + "error===>" + errorSize); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -130,7 +135,7 @@ public class SaveByV2ThreadPoolFacade { " (select p.* from V_SYNC_TO_V3_PATIENT p " + " left join V_SYNC_TO_V3_PDR pdr on pdr.p_no = p.p_no " + " where pdr.p_no is null and to_char(p.P_FILINGTIME,'YYYY-MM') BETWEEN '" + startTime + "' and '" + endTime + "' and ( p.P_ADDRESSCOUNTY='160' OR p.P_POSTPARTUMCOUNTY='160' OR p.P_RRCOUNTY ='160')" + - " and p.P_LASTMENSTRUALPERIOD > sysdate - 294" + + " and p.P_LASTMENSTRUALPERIOD > sysdate - 2940" + " union " + " select p.* from V_SYNC_TO_V3_PATIENT p " + " right join V_SYNC_TO_V3_PDR pdr on pdr.p_no = p.p_no " + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java index 84fe28b..4af8eac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java @@ -1,12 +1,28 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.biz.dal.IBasicConfigDao; +import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.PostReviewService; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.BookbuildingFacade; import com.lyms.platform.operate.web.request.SyncV2HistoryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.AntenatalExaminationModel; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.PostReviewQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; @@ -40,6 +56,9 @@ public class SyncV2HistoryWorkerx implements Callable { AtomicInteger existSize, AtomicInteger errorSize ) { + private IBasicConfigDao basicConfigDao; + + public SyncV2HistoryWorkerx(BookbuildingFacade bookbuildingFacade, List lists, MongoTemplate mongoTemplate,IBasicConfigDao basicConfigDao) { this.bookbuildingFacade = bookbuildingFacade; this.lists = lists; this.mongoTemplate = mongoTemplate; @@ -47,6 +66,7 @@ public class SyncV2HistoryWorkerx implements Callable { this.existSize = existSize; this.errorSize = errorSize; + this.basicConfigDao = basicConfigDao; } @Override @@ -62,6 +82,8 @@ public class SyncV2HistoryWorkerx implements Callable { list.setHospitalId("216");//todo list.setBookbuildingDoctor("1000000185");//todo list.setBookbuildingDate(DateUtil.getyyyy_MM_dd(new Date())); + list.setHusbandNationId(queryParentConfig(list.getHusbandNationId())); + list.setPregnantNationId(queryParentConfig(list.getHusbandNationId())); p = bookbuildingFacade.addPregnantBookbuilding(list, null, false); if (ErrorCodeConstants.SUCCESS == p.getErrorcode()) { okSize.incrementAndGet(); @@ -74,6 +96,14 @@ public class SyncV2HistoryWorkerx implements Callable { + public String queryParentConfig(String name) { + List basicConfigs = basicConfigDao.queryBasicConfig( + MongoCondition.newInstance("parentId", "4bc86dd6-2217-4a33-95f4-dc22ee70f2e3", MongoOper.IS). + and("yn", YnEnums.YES.getId(), MongoOper.IS). + and("name", name, MongoOper.IS).toMongoQuery() + ); + return basicConfigs.get(0).getId(); + } } diff --git a/platform-reportData/pom.xml b/platform-reportData/pom.xml index 9644848..96f25db 100644 --- a/platform-reportData/pom.xml +++ b/platform-reportData/pom.xml @@ -18,10 +18,10 @@ 1.0.1 - com.oracle - ojdbc14 - 11.2.0.1.0 - + com.oracle + ojdbc14 + 10.2.0.3.0 + diff --git a/pom.xml b/pom.xml index 61c0fa8..435e768 100644 --- a/pom.xml +++ b/pom.xml @@ -564,7 +564,7 @@ com.oracle ojdbc14 - 11.2.0.1.0 + 10.2.0.3.0 commons-dbutils @@ -582,11 +582,11 @@ 1.2.8 - - com.aspose - aspose-words - 15.8.0 - +