jiangjiazhi / regional-platform

Commit 613ef1c6304a16688b68b4c150f2b8145a1ad63e

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

增加设置parentid

Showing 2 changed files with 39 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java

...	...	@@ -114,9 +114,9 @@
114	114	referralApplyOrderModel.setExpVip(patients.getExpVip());
115	115	int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
116	116	HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
117		- referralApplyOrderModel.setrRisk(highScoreResult.getHighRisk());
	117	+ referralApplyOrderModel.setrRisk(highScoreResult.getHighId());
118	118	referralApplyOrderModel.setScore(highScoreResult.getScore());
119		- referralApplyOrderModel.setrLevel(highScoreResult.getLevel());
	119	+ referralApplyOrderModel.setrLevel(highScoreResult.getLevelId());
120	120	referralApplyOrderModel.setPid(patients.getPid());
121	121	referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
122	122	if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
...	...	@@ -181,8 +181,6 @@
181	181
182	182	referralApplyOrderModel.setId(null);
183	183	referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
184		- /* referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital());
185		- referralApplyOrderModel.setTransferredHospital(hospital);*/
186	184
187	185	applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
188	186	}

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
3	5	import java.util.ArrayList;
	6	+import java.util.Collections;
4	7	import java.util.List;
5	8
6	9	/**
...	...	@@ -11,7 +14,7 @@
11	14	//高危因素
12	15	private List highRisk = new ArrayList();
13	16	//风险等级颜色
14		- private List level= new ArrayList();
	17	+ private List level = new ArrayList();
15	18	//高危评分
16	19	private Integer score = 0;
17	20
18	21
...	...	@@ -32,12 +35,42 @@
32	35	}
33	36
34	37	public Integer getScore() {
35		- if(null==score){
	38	+ if (null == score) {
36	39	return 0;
37	40	}
38	41	return score;
39	42	}
40	43
	44	+ public List<String> getLevelId() {
	45	+ if (null == level) {
	46	+ return Collections.emptyList();
	47	+ }
	48	+ List<String> idList = new ArrayList<>();
	49	+ for (int i1 = 0; i1 < level.size(); i1++) {
	50	+ java.util.Map<String, String> map = (java.util.Map<String, String>) level.get(i1);
	51	+ String name = map.get("id");
	52	+ if (StringUtils.isNotEmpty(name)) {
	53	+ idList.add(name);
	54	+ }
	55	+ }
	56	+ return idList;
	57	+ }
	58	+
	59	+ public List<String> getHighId() {
	60	+ if (null == highRisk) {
	61	+ return Collections.emptyList();
	62	+ }
	63	+ List<String> idList = new ArrayList<>();
	64	+ for (int i1 = 0; i1 < highRisk.size(); i1++) {
	65	+ java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
	66	+ String id = map.get("id");
	67	+ if (StringUtils.isNotEmpty(id)) {
	68	+ idList.add(id);
	69	+ }
	70	+ }
	71	+ return idList;
	72	+ }
	73	+
41	74	public void setScore(Integer score) {
42	75	this.score = score;
43	76	}
...	...	@@ -54,7 +87,7 @@
54	87	stringBuilder.append(map.get("name")).append(", ");
55	88	}
56	89	}
57		- if(stringBuilder.length()>=2){
	90	+ if (stringBuilder.length() >= 2) {
58	91	stringBuilder.setLength(stringBuilder.length() - 2);
59	92	}
60	93	return stringBuilder.toString();
...	...	@@ -69,7 +102,7 @@
69	102	java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
70	103	stringBuilder.append(map.get("name")).append(", ");
71	104	}
72		- if(stringBuilder.length()>=2) {
	105	+ if (stringBuilder.length() >= 2) {
73	106	stringBuilder.setLength(stringBuilder.length() - 2);
74	107	}
75	108	return stringBuilder.toString();