jiangjiazhi / regional-platform | GitLab

Commit 0c46c7ccf75d808c8d310201e365e5373fbd6473

Authored by liquanyu almost 6 years ago

1 parent f14336c0a5

Exists in master and in 6 other branches

update

Showing 3 changed files with 3 additions and 2 deletions

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/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java

...	...	@@ -79,14 +79,12 @@
79	79	patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
80	80	query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
81	81	}
82		-
83	82	if (!StringUtils.isEmpty(patientsQuery.getDesc())) {
84	83	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, patientsQuery.getSort()));
85	84	}
86	85	if (!StringUtils.isEmpty(patientsQuery.getSort())) {
87	86	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort()));
88	87	}
89		-
90	88	return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id"));
91	89	}
92	90

...	...	@@ -2321,6 +2321,7 @@
2321	2321	// 分娩方式去另外一张表查
2322	2322	patientsQuery.setDesc("fmDate");
2323	2323	patientsQuery.setSort("fmDate");
	2324	+
2324	2325	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
2325	2326
2326	2327
...	...	@@ -2415,6 +2416,7 @@
2415	2416	// 这里就设置分页内容
2416	2417	childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2417	2418	} else {//否则按常规查询
	2419	+ System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2418	2420	maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
2419	2421	}
2420	2422

...	...	@@ -446,6 +446,7 @@
446	446	checkupResult.setTingliLeft(result.getTingliLeft());
447	447	checkupResult.setTingliRight(result.getTingliRight());
448	448	checkupResult.setYuyan(result.getYuyan());
	449	+ checkupResult.setSeJue(result.getSeJue());
449	450
450	451	return checkupResult;
451	452	}