jiangjiazhi / regional-platform | GitLab

Commit d83600aff04b5679fef9cb18b46d0c932cce9141

Authored by hujiaqi over 8 years ago

1 parent 236b88f32c

Exists in master and in 7 other branches

BUG

Showing 3 changed files with 17 additions and 0 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -66,9 +66,13 @@
66	66	patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
67	67	query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
68	68	}
	69	+ if(!StringUtils.isEmpty(patientsQuery.getDesc())){
	70	+ return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, patientsQuery.getSort()));
	71	+ }
69	72	if(!StringUtils.isEmpty(patientsQuery.getSort())){
70	73	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort()));
71	74	}
	75	+
72	76
73	77	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id"));
74	78	}

...	...	@@ -117,6 +117,16 @@
117	117	//区域来源
118	118	private String source;
119	119
	120	+ private String desc;
	121	+
	122	+ public String getDesc() {
	123	+ return desc;
	124	+ }
	125	+
	126	+ public void setDesc(String desc) {
	127	+ this.desc = desc;
	128	+ }
	129	+
120	130	public String getNotEnable() {
121	131	return notEnable;
122	132	}

...	...	@@ -1058,6 +1058,8 @@
1058	1058	patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7);
1059	1059	patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7);
1060	1060	// 分娩方式去另外一张表查
	1061	+ patientsQuery.setDesc("fmDate");
	1062	+ patientsQuery.setSort("fmDate");
1061	1063	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
1062	1064	// 这里就设置分页内容
1063	1065	childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
...	...	@@ -1507,6 +1509,7 @@
1507	1509	}
1508	1510	babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
1509	1511	babyModelQuery.setBuildType(2);
	1512	+ babyModelQuery.setOrder("birth");
1510	1513	List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1511	1514	if (CollectionUtils.isEmpty(babyModelList)) {
1512	1515	newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());