fangcheng / regional-platform

Authored by hujiaqi over 8 years ago

Exists in master

Showing 3 changed files with 18 additions and 4 deletions

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
11	11	import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
12	12	import com.lyms.platform.operate.web.result.*;
	13	+import com.lyms.platform.pojo.BasicConfig;
13	14	import com.lyms.platform.pojo.DischargeAbstractBabyModel;
14	15	import com.lyms.platform.pojo.DischargeAbstractMotherModel;
15	16	import com.lyms.platform.pojo.Patients;
...	...	@@ -189,7 +190,8 @@
189	190	for (String riskFactoryId : riskFactorIdList) {
190	191	RiskFactoryResultModel riskFactoryResultModel = new RiskFactoryResultModel();
191	192	try {
192		- String name = basicConfigService.getOneBasicConfigById(riskFactoryId).getName();
	193	+ BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(riskFactoryId);
	194	+ String name = basicConfig1.getName();
193	195	boolean flag = true;
194	196	if (riskFactoryResultModelList.size() > 0) {
195	197	for (RiskFactoryResultModel factoryResultModel : riskFactoryResultModelList) {
...	...	@@ -200,6 +202,8 @@
200	202	}
201	203	if (flag) {
202	204	riskFactoryResultModel.setName(name);
	205	+ BasicConfig basicConfig2 = basicConfigService.getOneBasicConfigById(basicConfig1.getParentId());
	206	+ name = basicConfig2.getName();
203	207	riskFactoryResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
204	208	riskFactoryResultModelList.add(riskFactoryResultModel);
205	209	}

...	...	@@ -35,6 +35,16 @@
35	35	*/
36	36	private Integer afterMakeBabyDays;
37	37
	38	+ private String inputMan;
	39	+
	40	+ public String getInputMan() {
	41	+ return inputMan;
	42	+ }
	43	+
	44	+ public void setInputMan(String inputMan) {
	45	+ this.inputMan = inputMan;
	46	+ }
	47	+
38	48	public String getId() {
39	49	return id;
40	50	}

...	...	@@ -79,7 +79,7 @@
79	79	* @createTime 2016年12月06日 14时15分
80	80	* @discription 高危评分
81	81	*/
82		- private String riskScore;
	82	+ private Integer riskScore;
83	83
84	84	/**
85	85	* @auther HuJiaqi
86	86
...	...	@@ -165,11 +165,11 @@
165	165	this.riskFactoryResultModelList = riskFactoryResultModelList;
166	166	}
167	167
168		- public String getRiskScore() {
	168	+ public Integer getRiskScore() {
169	169	return riskScore;
170	170	}
171	171
172		- public void setRiskScore(String riskScore) {
	172	+ public void setRiskScore(Integer riskScore) {
173	173	this.riskScore = riskScore;
174	174	}
175	175