jiangjiazhi / regional-platform

Commit 44c6832bd13c37c8cca186683dd15d708672e3ef

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

update code

Showing 3 changed files with 34 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

...	...	@@ -135,7 +135,7 @@
135	135	model.setHematuria(request.getHematuria());
136	136	model.setOtherUrine(request.getOtherUrine());
137	137
138		- model.setDiagnose(request.getDiagnose());
	138	+ model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
139	139	model.setHandlSuggest(request.getHandlSuggest());
140	140	model.setGuideSuggest(request.getGuideSuggest());
141	141	model.setCheckDoctor(request.getCheckDoctor());
142	142
...	...	@@ -477,8 +477,32 @@
477	477	model.setUrineAcetone(checkModel.getUrineAcetone());
478	478	model.setHematuria(checkModel.getHematuria());
479	479	model.setOtherUrine(checkModel.getOtherUrine());
	480	+ List<Map<String, String>> list = new ArrayList<>();
	481	+ String diagnoseStr = checkModel.getDiagnose();
	482	+ if (!StringUtils.isEmpty(diagnoseStr))
	483	+ {
	484	+ List diagnoses = JsonUtil.toList(diagnoseStr,List.class);
	485	+ for (Object obj : diagnoses)
	486	+ {
	487	+ if (obj != null)
	488	+ {
	489	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	490	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	491	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
	492	+ basicConfigQuery.setId(String.valueOf(obj));
	493	+ List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	494	+ if (CollectionUtils.isNotEmpty(datas))
	495	+ {
	496	+ Map<String,String> map = new HashMap<>();
	497	+ map.put("id", datas.get(0).getId());
	498	+ map.put("name",datas.get(0).getName());
	499	+ list.add(map);
	500	+ }
	501	+ }
480	502
481		- model.setDiagnose(checkModel.getDiagnose());
	503	+ }
	504	+ }
	505	+ model.setDiagnose(list);
482	506	model.setHandlSuggest(checkModel.getHandlSuggest());
483	507	model.setGuideSuggest(checkModel.getGuideSuggest());
484	508	model.setCheckDoctor(checkModel.getCheckDoctor());

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.core.annotation.form.FormParam;
4	4	import org.hibernate.validator.constraints.NotEmpty;
5	5
	6	+import java.util.List;
6	7	import java.util.Map;
7	8
8	9	/**
...	...	@@ -188,7 +189,7 @@
188	189	/****诊断指导**/
189	190
190	191	//诊断
191		- private String diagnose;
	192	+ private List<String> diagnose;
192	193
193	194	//处理意见
194	195	private String handlSuggest;
195	196
...	...	@@ -398,11 +399,11 @@
398	399	this.bilirubinBelly = bilirubinBelly;
399	400	}
400	401
401		- public String getDiagnose() {
	402	+ public List<String> getDiagnose() {
402	403	return diagnose;
403	404	}
404	405
405		- public void setDiagnose(String diagnose) {
	406	+ public void setDiagnose(List<String> diagnose) {
406	407	this.diagnose = diagnose;
407	408	}
408	409

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import java.util.List;
3	4	import java.util.Map;
4	5
5	6	/**
...	...	@@ -179,7 +180,7 @@
179	180	/****诊断指导**/
180	181
181	182	//诊断
182		- private String diagnose;
	183	+ private List<Map<String,String>> diagnose;
183	184
184	185	//处理意见
185	186	private String handlSuggest;
186	187
...	...	@@ -619,11 +620,11 @@
619	620	this.otherUrine = otherUrine;
620	621	}
621	622
622		- public String getDiagnose() {
	623	+ public List<Map<String, String>> getDiagnose() {
623	624	return diagnose;
624	625	}
625	626
626		- public void setDiagnose(String diagnose) {
	627	+ public void setDiagnose(List<Map<String, String>> diagnose) {
627	628	this.diagnose = diagnose;
628	629	}
629	630