shiyang / regional-platform

Commit a1448b8e2105da1c7c4885f7eef52e4c70f05c80

Authored by jiangjiazhi over 9 years ago

增加设置parentid

Showing 2 changed files with 20 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java

...	...	@@ -12,7 +12,9 @@
12	12	import com.lyms.platform.operate.web.result.MatDeliverListResult;
13	13	import com.lyms.platform.operate.web.result.MaternalDeliverResult;
14	14	import com.lyms.platform.permission.model.Organization;
	15	+import com.lyms.platform.permission.model.Users;
15	16	import com.lyms.platform.permission.service.OrganizationService;
	17	+import com.lyms.platform.permission.service.UsersService;
16	18	import com.lyms.platform.pojo.*;
17	19	import com.lyms.platform.query.*;
18	20	import org.apache.commons.collections.CollectionUtils;
...	...	@@ -47,6 +49,8 @@
47	49	private AutoMatchFacade autoMatchFacade;
48	50	@Autowired
49	51	private PersonService personService;
	52	+ @Autowired
	53	+ private UsersService usersService;
50	54
51	55	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
52	56
...	...	@@ -506,6 +510,14 @@
506	510	MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult();
507	511
508	512	maternalDeliverResult.convertToResult(deliverModel);
	513	+ String doctorId = deliverModel.getDeliverDoctor();
	514	+ Users users= usersService.getUsers(Integer.valueOf(doctorId));
	515	+ Map<String,String> map =new HashMap<>();
	516	+ if(null!=users){
	517	+ map.put("id",users.getId()+"");
	518	+ map.put("name",users.getName());
	519	+ }
	520	+ maternalDeliverResult.setDeliverDoctor(map);
509	521	//获取新生儿信息
510	522	List<MaternalDeliverModel.Baby> babyIdList = deliverModel.getBaby();
511	523	List babyList = new ArrayList();

...	...	@@ -75,7 +75,7 @@
75	75	//分娩医院
76	76	private String fmHospital;
77	77	//接生医生
78		- private String deliverDoctor;
	78	+ private Map<String,String> deliverDoctor;
79	79
80	80	public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
81	81	setId(destModel.getId());
82	82
83	83
...	...	@@ -96,20 +96,20 @@
96	96	setNeedleNum(destModel.getNeedleNum());
97	97	setMaternalInfo(destModel.getMaternalInfo());
98	98	setDeathCause(destModel.getDeathCause());
99		- setChBp(JsonUtil.str2Obj(destModel.getChBp(),Map.class));
100		- setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(),Map.class));
	99	+ setChBp(JsonUtil.str2Obj(destModel.getChBp(), Map.class));
	100	+ setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(), Map.class));
101	101	setBreath(destModel.getBreath());
102	102	setPulse(destModel.getPulse());
103	103	setoHloseBloodL(destModel.getoHloseBloodL());
104	104	settHloseBloodL(destModel.gettHloseBloodL());
105	105	setrHloseBloodL(destModel.getrHloseBloodL());
106	106	setsHloseBloodL(destModel.getsHloseBloodL());
107		- setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(),Map.class));
108		- setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class));
	107	+ setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(), Map.class));
	108	+ setOcs(JsonUtil.str2Obj(destModel.getOcs(), Map.class));
109	109	setExtPlacentas(destModel.getExtPlacentas());
110	110	setFmHospital(destModel.getFmHospital());
111	111
112		- setDeliverDoctor(destModel.getDeliverDoctor());
	112	+
113	113	return this;
114	114	}
115	115
116	116
117	117
...	...	@@ -324,15 +324,13 @@
324	324	this.deathCause = deathCause;
325	325	}
326	326
327		- public String getDeliverDoctor() {
	327	+ public Map<String, String> getDeliverDoctor() {
328	328	return deliverDoctor;
329	329	}
330	330
331		- public void setDeliverDoctor(String deliverDoctor) {
	331	+ public void setDeliverDoctor(Map<String, String> deliverDoctor) {
332	332	this.deliverDoctor = deliverDoctor;
333	333	}
334		-
335		-
336	334
337	335	public String getDueDate() {
338	336	return dueDate;