jiangjiazhi / regional-platform

Commit 72d0a20fea2026d5485ab76dcbe3e9c65c1d5811

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 109 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -1908,6 +1908,7 @@
1908	1908	// 后续业务操作
1909	1909	SieveAddRequest sieveAddRequest = new SieveAddRequest();
1910	1910	sieveAddRequest.setParentId(patientsId);
	1911	+ sieveAddRequest.setSiveType("2");
1911	1912	Integer userId = null;
1912	1913	sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model);
1913	1914
1914	1915
...	...	@@ -2271,12 +2272,49 @@
2271	2272	// 后续业务操作
2272	2273	SieveAddRequest sieveAddRequest = new SieveAddRequest();
2273	2274	sieveAddRequest.setParentId(patientsId);
	2275	+ sieveAddRequest.setSiveType("2");
2274	2276	Integer userId = null;
2275	2277	sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model);
2276	2278	}
2277	2279	}
2278	2280	}).start();
2279	2281	}
	2282	+
	2283	+
	2284	+ /**
	2285	+ * 定时获取华大基因的产筛结果
	2286	+ */
	2287	+ public void autoGetSiveResult()
	2288	+ {
	2289	+ SieveQuery sieveQuery = new SieveQuery();
	2290	+ sieveQuery.setSieveType("2");
	2291	+ sieveQuery.setStatus(2);
	2292	+ sieveQuery.setYn(YnEnums.YES.getId());
	2293	+ sieveQuery.setNeed("true");
	2294	+ sieveQuery.setLimit(2000);
	2295	+ sieveQuery.setPage(1);
	2296	+ List<SieveModel> list = sieveService.queryList(sieveQuery);
	2297	+
	2298	+ if (CollectionUtils.isNotEmpty(list))
	2299	+ {
	2300	+ for (SieveModel sieveModel : list)
	2301	+ {
	2302	+ List<SieveApplyOrderModel> sieveApplyOrderModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(sieveModel.getParentId()).and("yn").
	2303	+ is(YnEnums.YES.getId()).and("sieveType").is("2")), SieveApplyOrderModel.class);
	2304	+
	2305	+ if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
	2306	+ {
	2307	+ for (SieveApplyOrderModel sieveApplyOrderModel : sieveApplyOrderModels)
	2308	+ {
	2309	+ resultCallback(sieveApplyOrderModel.getNumber(), "uc0d98e79de93d6e49521deab9b0d9eb7a");
	2310	+ }
	2311	+ }
	2312	+ }
	2313	+ }
	2314	+ }
	2315	+
	2316	+
	2317	+
2280	2318
2281	2319	/拼json使用/
2282	2320	class AllParamsRequest {

...	...	@@ -160,6 +160,10 @@
160	160	if(StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())){
161	161	sieveQuery.setId(sieveAddRequest.getLymsSieveId());
162	162	}
	163	+
	164	+ if(StringUtils.isNotEmpty(sieveAddRequest.getSiveType())){
	165	+ sieveQuery.setSieveType(sieveAddRequest.getSiveType());
	166	+ }
163	167	sieveQuery.setYn(YnEnums.YES.getId());
164	168	List<SieveModel> list = sieveService.queryList(sieveQuery);
165	169
...	...	@@ -448,6 +452,9 @@
448	452	* @return
449	453	*/
450	454	public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) {
	455	+
	456	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	457	+
451	458	List<SieveListResult> data = new ArrayList<>();
452	459	SieveQuery sieveQuery = new SieveQuery();
453	460	sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
...	...	@@ -459,6 +466,26 @@
459	466	sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult());
460	467	sieveQuery.setName(cqSieveQueryRequest.getName());
461	468	sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo());
	469	+
	470	+ if (StringUtils.isNotEmpty(cqSieveQueryRequest.getVcCardNo()))
	471	+ {
	472	+ PatientsQuery patientsQuery = new PatientsQuery();
	473	+ patientsQuery.setHospitalId(hospitalId);
	474	+ patientsQuery.setYn(YnEnums.YES.getId());
	475	+ patientsQuery.setVcCardNo(cqSieveQueryRequest.getVcCardNo());
	476	+ List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
	477	+ if (CollectionUtils.isNotEmpty(localPatients))
	478	+ {
	479	+ List<String> ids = new ArrayList<>();
	480	+ for (Patients pat : localPatients)
	481	+ {
	482	+ ids.add(pat.getId());
	483	+ }
	484	+ sieveQuery.setParentIds(ids);
	485	+ }
	486	+ }
	487	+
	488	+
462	489	//省市区查询
463	490	sieveQuery.setProvinceId(cqSieveQueryRequest.getProvinceId());
464	491	sieveQuery.setCityId(cqSieveQueryRequest.getCityId());
...	...	@@ -511,7 +538,7 @@
511	538
512	539
513	540	sieveQuery.setNeed(needPage);
514		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	541	+
515	542
516	543	if (isSieveLagManage) {
517	544	if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId())) {

...	...	@@ -92,6 +92,16 @@
92	92	*/
93	93	private String reportType;
94	94
	95	+ private String vcCardNo;
	96	+
	97	+ public String getVcCardNo() {
	98	+ return vcCardNo;
	99	+ }
	100	+
	101	+ public void setVcCardNo(String vcCardNo) {
	102	+ this.vcCardNo = vcCardNo;
	103	+ }
	104	+
95	105	public List<Integer> getStatuses() {
96	106	return statuses;
97	107	}

...	...	@@ -64,6 +64,16 @@
64	64
65	65	private String reportType;
66	66
	67	+ private String siveType;
	68	+
	69	+ public String getSiveType() {
	70	+ return siveType;
	71	+ }
	72	+
	73	+ public void setSiveType(String siveType) {
	74	+ this.siveType = siveType;
	75	+ }
	76	+
67	77	public String getuE3() {
68	78	return uE3;
69	79	}

...	...	@@ -446,17 +446,32 @@
446	446
447	447	<!-- 新生儿出院诊断记录同步 -->
448	448	<bean id="autoGetBabyDiagnoseJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	449	+ <!-- 要调用的bean -->
	450	+ <property name="targetObject" ref="babyBookbuildingFacade"/>
	451	+ <!-- 要调用的Method -->
	452	+ <property name="targetMethod" value="autoGetBabyDiagnose"/>
	453	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	454	+ <property name="concurrent" value="false"/>
	455	+</bean>
	456	+
	457	+ <bean id="autoGetBabyDiagnoseJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	458	+ <property name="jobDetail" ref="autoGetBabyDiagnoseJob"/>
	459	+ <property name="cronExpression" value="0 0/5 * * * ?"/>
	460	+ </bean>
	461	+
	462	+
	463	+ <bean id="autoGetSieveJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
449	464	<!-- 要调用的bean -->
450		- <property name="targetObject" ref="babyBookbuildingFacade"/>
	465	+ <property name="targetObject" ref="applyOrderFacade"/>
451	466	<!-- 要调用的Method -->
452		- <property name="targetMethod" value="autoGetBabyDiagnose"/>
	467	+ <property name="targetMethod" value="autoGetSiveResult"/>
453	468	<!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
454	469	<property name="concurrent" value="false"/>
455	470	</bean>
456	471
457		- <bean id="autoGetBabyDiagnoseJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
458		- <property name="jobDetail" ref="autoGetBabyDiagnoseJob"/>
459		- <property name="cronExpression" value="0 0/5 * * * ?"/>
	472	+ <bean id="autoGetSieveTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	473	+ <property name="jobDetail" ref="autoGetSieveJob"/>
	474	+ <property name="cronExpression" value="0 45 14 * * ?"></property>
460	475	</bean>
461	476
462	477
...	...	@@ -486,6 +501,9 @@
486	501	<ref bean="rcDataJobTrigger" />
487	502	<!--荣成公卫触发器-->
488	503	<ref bean="rcGongWeiTrigger" />
	504	+
	505	+ <ref bean="autoGetSieveTrigger" />
	506	+
489	507	<!--陵城孕前优生临床检查自动保存到表
490	508	<ref bean="dzlcTyTrigger" />-->
491	509