diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 4a97a7e..2c8c480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1908,6 +1908,7 @@ public class ApplyOrderFacade { // 后续业务操作 SieveAddRequest sieveAddRequest = new SieveAddRequest(); sieveAddRequest.setParentId(patientsId); + sieveAddRequest.setSiveType("2"); Integer userId = null; sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model); @@ -2271,6 +2272,7 @@ public class ApplyOrderFacade { // 后续业务操作 SieveAddRequest sieveAddRequest = new SieveAddRequest(); sieveAddRequest.setParentId(patientsId); + sieveAddRequest.setSiveType("2"); Integer userId = null; sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model); } @@ -2278,6 +2280,42 @@ public class ApplyOrderFacade { }).start(); } + + /** + * 定时获取华大基因的产筛结果 + */ + public void autoGetSiveResult() + { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setSieveType("2"); + sieveQuery.setStatus(2); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setNeed("true"); + sieveQuery.setLimit(2000); + sieveQuery.setPage(1); + List list = sieveService.queryList(sieveQuery); + + if (CollectionUtils.isNotEmpty(list)) + { + for (SieveModel sieveModel : list) + { + List sieveApplyOrderModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(sieveModel.getParentId()).and("yn"). + is(YnEnums.YES.getId()).and("sieveType").is("2")), SieveApplyOrderModel.class); + + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) + { + for (SieveApplyOrderModel sieveApplyOrderModel : sieveApplyOrderModels) + { + resultCallback(sieveApplyOrderModel.getNumber(), "uc0d98e79de93d6e49521deab9b0d9eb7a"); + } + } + } + } + } + + + + /*拼json使用*/ class AllParamsRequest { private String productLine; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 830e14c..b7ff198 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -160,6 +160,10 @@ public class SieveFacade { if(StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())){ sieveQuery.setId(sieveAddRequest.getLymsSieveId()); } + + if(StringUtils.isNotEmpty(sieveAddRequest.getSiveType())){ + sieveQuery.setSieveType(sieveAddRequest.getSiveType()); + } sieveQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryList(sieveQuery); @@ -448,6 +452,9 @@ public class SieveFacade { * @return */ public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + List data = new ArrayList<>(); SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo()); @@ -459,6 +466,26 @@ public class SieveFacade { sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult()); sieveQuery.setName(cqSieveQueryRequest.getName()); sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo()); + + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getVcCardNo())) + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setVcCardNo(cqSieveQueryRequest.getVcCardNo()); + List localPatients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(localPatients)) + { + List ids = new ArrayList<>(); + for (Patients pat : localPatients) + { + ids.add(pat.getId()); + } + sieveQuery.setParentIds(ids); + } + } + + //省市区查询 sieveQuery.setProvinceId(cqSieveQueryRequest.getProvinceId()); sieveQuery.setCityId(cqSieveQueryRequest.getCityId()); @@ -511,7 +538,7 @@ public class SieveFacade { sieveQuery.setNeed(needPage); - String hospitalId = autoMatchFacade.getHospitalId(userId); + if (isSieveLagManage) { if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index b7e452c..9135a0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -92,6 +92,16 @@ public class CqSieveQueryRequest extends BasePageQueryRequest { */ private String reportType; + private String vcCardNo; + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + public List getStatuses() { return statuses; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index d47379c..29c8333 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -64,6 +64,16 @@ public class SieveAddRequest implements IBasicRequestConvert { private String reportType; + private String siveType; + + public String getSiveType() { + return siveType; + } + + public void setSiveType(String siveType) { + this.siveType = siveType; + } + public String getuE3() { return uE3; } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 42efc99..118062c 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -446,17 +446,32 @@ + + + + + + + + + + + + + + + - + - + - - - + + + @@ -486,6 +501,9 @@ + + +