jiangjiazhi / regional-platform

Commit 3979bf7edc8377319949e2ef0b9bb2e9f0bf7980

Authored by zhangchao over 1 year ago

Exists in dev

#fix:优化大同分娩周期及孕产妇管理列表数据查询逻辑

Showing 3 changed files with 26 additions and 10 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java

...	...	@@ -329,7 +329,7 @@
329	329	antExChuQuery.mysqlBuild(iAntExChuDao.count(query));
330	330	query.start(antExChuQuery.getOffset()).end(antExChuQuery.getLimit());
331	331	}
332		- System.out.println(query.convertToMongoQuery().toString());
	332	+ //System.out.println(query.convertToMongoQuery().toString());
333	333	return iAntExChuDao.query(query.addOrder(Sort.Direction.DESC, "created"));
334	334	}
335	335

...	...	@@ -108,7 +108,7 @@
108	108	if (!StringUtils.isEmpty(patientsQuery.getSort())) {
109	109	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort()));
110	110	}
111		- System.out.println(query.convertToMongoQuery().toString());
	111	+ //System.out.println(query.convertToMongoQuery().toString());
112	112	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id"));
113	113	}
114	114
...	...	@@ -552,8 +552,9 @@
552	552
553	553	public void setAutoMatDeliver(String cardNo,Date dueDate)
554	554	{
555		-// Date endDate = DateUtil.addDay(new Date(), -294);
556		- Date endDate = DateUtil.addDay(new Date(), -301);
	555	+ //大同为42孕周其余为43孕周
	556	+ Date endDate = DateUtil.addDay(new Date(), -294);
	557	+ // Date endDate = DateUtil.addDay(new Date(), -301);
557	558	PatientsQuery patientsQuery = new PatientsQuery();
558	559	patientsQuery.setYn(YnEnums.YES.getId());
559	560	patientsQuery.setType(1);

...	...	@@ -744,12 +744,27 @@
744	744	}
745	745	}
746	746	} else {
747		- //这里排序参考RiskPatientsQueryRequest里面的sort和order字段逻辑
748		- riskPatientsQueryRequest.setSort("6");//按分娩时间排序
749		- riskPatientsQueryRequest.setOrder("1");//降序
750		- //以前逻辑
751		- System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
752		- patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	747	+ if ("2100002419".equals(hospital)){
	748	+ if ("2".equals(riskPatientsQueryRequest.getYyzt())) {
	749	+ //获取没有有检查数据
	750	+ patientsQuery.setNextCheckTimeIs(true);
	751	+ patientsQuery.setNextCheckTimeNe(false);
	752	+ patientses = patientsService.queryPatientBySort(patientsQuery, "created","desc");
	753	+ } else{
	754	+ //获取有检查数据
	755	+ patientsQuery.setNextCheckTimeNe(true);
	756	+ patientsQuery.setNextCheckTimeIs(false);
	757	+ patientses = patientsService.queryPatientBySort(patientsQuery, "nextCheckTime","asc");
	758	+ }
	759	+ }else {
	760	+ //这里排序参考RiskPatientsQueryRequest里面的sort和order字段逻辑
	761	+ riskPatientsQueryRequest.setSort("6");//按分娩时间排序
	762	+ riskPatientsQueryRequest.setOrder("1");//降序
	763	+ //以前逻辑
	764	+ //System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
	765	+ patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	766	+
	767	+ }
753	768	}
754	769	stopWatch.stop();
755	770	// logger.info(stopWatch.toString());