jiangjiazhi / regional-platform | GitLab

Commit b49f358e882347cbe01fa0f6b2d1462ab3067bf3

Authored by jiangjiazhi almost 9 years ago

1 parent 4a2475b53b

Exists in master and in 8 other branches

增加是否通知

Showing 3 changed files with 3 additions and 3 deletions

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

...	...	@@ -33,7 +33,7 @@
33	33	public List<AntenatalExaminationModel> findAllByParentId(String parentId) {
34	34	Assert.notNull(parentId, "findAllByParentId parentId must not be null.");
35	35	MongoCondition condition = MongoCondition.newInstance("parentId", parentId, MongoOper.IS).and("yn", YnEnums.YES.getId(),MongoOper.IS);
36		- return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.ASC,"created"));
	36	+ return iAntenatalExaminationDao.queryAntenatalExamination(condition.toMongoQuery().addOrder(Sort.Direction.DESC,"created"));
37	37	}
38	38
39	39

...	...	@@ -122,7 +122,7 @@
122	122	*
123	123	* @return
124	124	*/
125		- private List findLastRisk(String parentId) {
	125	+ public List findLastRisk(String parentId) {
126	126	List<AntenatalExaminationModel> list = antenatalExaminationService.findAllByParentId(parentId);
127	127	AntenatalExaminationModel model = null;
128	128	if (CollectionUtils.isNotEmpty(list)) {

...	...	@@ -237,7 +237,7 @@
237	237	patientBaseResult.convert(patients);
238	238	}
239	239	try {
240		- patientBaseResult.setRiskFactor(antenatalExaminationFacade.queryRisk(patients.getFirstRiskFactorId()));
	240	+ patientBaseResult.setRiskFactor(antenatalExaminationFacade.findLastRisk(patients.getId()));
241	241	} catch (Exception e) {
242	242	}
243	243	return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);