jiangjiazhi / regional-platform

Commit b4ac6101c560de080d9f83f2b315529e11f40e53

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

追访

Showing 1 changed file with 4 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -932,7 +932,6 @@
932	932	String parentId = jsonObject.getString("parentId");
933	933	int type = jsonObject.getInt("type");
934	934
935		- Map<String, Object> map = new HashMap<>();
936	935
937	936	Patients pat = patientsService.findOnePatientById(parentId);
938	937	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false);
...	...	@@ -943,7 +942,6 @@
943	942	patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
944	943	patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
945	944
946		- map.put("patientInfo", patientBaseResult);
947	945	SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
948	946	sieveApplyOrderQuery1.setParentId(parentId);
949	947	sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
...	...	@@ -956,6 +954,7 @@
956	954	List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
957	955	if (CollectionUtils.isNotEmpty(list)) {
958	956	SieveResultModel model = list.get(0);
	957	+ sieveResultEditInfo.put("patientInfo", patientBaseResult);
959	958	sieveResultEditInfo.put("id", model.getId());
960	959	sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : "");
961	960	sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
962	961
...	...	@@ -1015,13 +1014,13 @@
1015	1014	}
1016	1015	sieveResultEditInfo.put("stzhz13", stzhz13);
1017	1016	}
1018		- map.put("sieveResultEditInfo", sieveResultEditInfo);
	1017	+ baseResponse.setObject(sieveResultEditInfo);
1019	1018	} else {//查看申请单
1020	1019	List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
1021	1020	if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
1022	1021	Map<String, Object> result = new HashMap<>();
1023	1022	SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
1024		-
	1023	+ result.put("patientInfo", patientBaseResult);
1025	1024	result.put("weight", sieveApply.getWeight());
1026	1025	result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
1027	1026	result.put("bbh", sieveApply.getNumber());
1028	1027
...	...	@@ -1055,8 +1054,8 @@
1055	1054	result.put("lastMenstr", chuModel.getLastMenses());
1056	1055	result.put("polyember", isTire);
1057	1056	}
	1057	+ baseResponse.setObject(result);
1058	1058	}
1059		- baseResponse.setObject(map);
1060	1059	}
1061	1060	return baseResponse;
1062	1061	}