jiangjiazhi / regional-platform | GitLab

Commit b7c4950d61252d5fd79b6dfdbaaba5c211063d32

Authored by shiyang over 3 years ago

1 parent 46df34f5fe

Exists in master and in 6 other branches

update

Showing 2 changed files with 5 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java

...	...	@@ -688,8 +688,6 @@
688	688	* @return
689	689	*/
690	690	public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
691		- riskPatientsQueryRequest.setSort("fmDate");//统一按分娩时间排序
692		- riskPatientsQueryRequest.setOrder("DESC");//降序
693	691	//组合请求
694	692	PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
695	693	patientsQuery.setGcdfDoctorId(riskPatientsQueryRequest.getGcdfDoctorId());//分娩记录加住院管床大夫
...	...	@@ -718,6 +716,9 @@
718	716	}
719	717	}
720	718	} else {
	719	+ //这里排序参考RiskPatientsQueryRequest里面的sort和order字段逻辑
	720	+ riskPatientsQueryRequest.setSort("6");//按分娩时间排序
	721	+ riskPatientsQueryRequest.setOrder("1");//降序
721	722	//以前逻辑
722	723	System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
723	724	patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());

...	...	@@ -293,7 +293,8 @@
293	293	SORT_BUILD_DATE("2", "bookbuildingDate"),//按建档时间排
294	294	SORT_DUE_TIME("3", "lastMenses"),//按孕产期排
295	295	SORT_DUE_DETE("4", "lastMenses"),//按当前孕周排
296		- SORT_DUE_DATE("5", "nextCheckTime");//下次产检时间
	296	+ SORT_DUE_DATE("5", "nextCheckTime"),//下次产检时间
	297	+ SORT_FM_DATE("6", "fmDate");//分娩时间
297	298
298	299	private SortEnum(String id, String sort) {
299	300	this.id = id