jiangjiazhi / regional-platform

Commit 1bf3c86a1ff8fe412e1aafa8dda4581d3812c920

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

高危修改

Showing 3 changed files with 23 additions and 1 deletions

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/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java

...	...	@@ -773,6 +773,7 @@
773	773	if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"[]".equals(model.getRiskFactor())) {
774	774	List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
775	775	highScoreResult = queryRisk(list1, needLevel);
	776	+ highScoreResult.setHighriskDesc(model.getHighriskDesc());
776	777	next = false;
777	778	}
778	779	if (null != model && !"{}".equals(model.getOtherRisk()) && !"[]".equals(model.getOtherRisk())) {
...	...	@@ -821,6 +822,7 @@
821	822	}
822	823	if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) {
823	824	List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
	825	+ highScoreResult.setHighriskDesc(antExChuModel.getHighriskDesc());
824	826	highScoreResult = queryRisk(list2, needLevel);
825	827	next = false;
826	828	}
827	829
828	830
...	...	@@ -1435,13 +1437,15 @@
1435	1437
1436	1438	public BaseResponse getLastRisk(String patientId, Integer id) {
1437	1439	List highRisk = new ArrayList();
	1440	+ String highriskDesc = "";
1438	1441	Patients patients = patientsService.findOnePatientById(patientId);
1439	1442	if (patients != null) {
1440	1443	HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
1441	1444	highRisk = highScoreResult.getHighRisk();
	1445	+ highriskDesc = highScoreResult.getHighriskDesc();
1442	1446	}
1443	1447
1444		- return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1448	+ return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc);
1445	1449	}
1446	1450
1447	1451

...	...	@@ -1784,6 +1784,9 @@
1784	1784	//聊城东昌府区妇幼保健医院特有字段
1785	1785	map.put("lisCheckItems", data.getLisCheckItems());
1786	1786
	1787	+ //补充高危因素
	1788	+ map.put("highriskDesc", data.getHighriskDesc());
	1789	+
1787	1790	br.setErrorcode(ErrorCodeConstants.SUCCESS);
1788	1791	br.setErrormsg("成功");
1789	1792	br.setData(map);
...	...	@@ -2064,6 +2067,10 @@
2064	2067
2065	2068	//诸城妇幼复诊特有字段随机血糖单位mmol/L
2066	2069	map.put("randomBloodSugar", StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar() + UnitConstants.MMOLL : "");
	2070	+
	2071	+
	2072	+ //补充高危因素
	2073	+ map.put("highriskDesc", data.getHighriskDesc());
2067	2074
2068	2075	br.setErrorcode(ErrorCodeConstants.SUCCESS);
2069	2076	br.setErrormsg("成功");

...	...	@@ -21,6 +21,17 @@
21	21	//高危评分
22	22	private Integer score = 0;
23	23
	24	+ //补充高危因素
	25	+ private String highriskDesc;
	26	+
	27	+ public String getHighriskDesc() {
	28	+ return highriskDesc;
	29	+ }
	30	+
	31	+ public void setHighriskDesc(String highriskDesc) {
	32	+ this.highriskDesc = highriskDesc;
	33	+ }
	34	+
24	35	public List getHighRisk() {
25	36	return highRisk;
26	37	}