fangcheng / regional-platform

Commit c13148a3f5186520fa5abc1e924ca51d85021f01

Authored by jiangjiazhi over 9 years ago

增加设置parentid

Showing 3 changed files with 29 additions and 11 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/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -12,7 +12,9 @@
12	12	import com.lyms.platform.operate.web.request.*;
13	13	import com.lyms.platform.operate.web.result.*;
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;
...	...	@@ -51,6 +53,8 @@
51	53	private AutoMatchFacade autoMatchFacade;
52	54	@Autowired
53	55	private StopPregnancyService stopPregnancyService;
	56	+ @Autowired
	57	+ private UsersService usersService;
54	58
55	59
56	60	/**
...	...	@@ -734,6 +738,15 @@
734	738	if (null != data) {
735	739	data = patients.getLastMenses();
736	740	}
	741	+
	742	+ String doctorId = examinationModel.getCheckDoctor();
	743	+ Users users= usersService.getUsers(Integer.valueOf(doctorId));
	744	+ Map<String,String> map1 =new HashMap<>();
	745	+ if(null!=users){
	746	+ map1.put("id",users.getId()+"");
	747	+ map1.put("name",users.getName());
	748	+ }
	749	+ antenatalExaminationResult.setCheckDoctor(map1);
737	750	antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
738	751	antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
739	752	object = antenatalExaminationResult;
...	...	@@ -764,6 +777,14 @@
764	777	}
765	778	} catch (Exception e) {
766	779	}
	780	+ String doctorId = antExChuModel.getProdDoctor();
	781	+ Users users= usersService.getUsers(Integer.valueOf(doctorId));
	782	+ Map<String,String> map1 =new HashMap<>();
	783	+ if(null!=users){
	784	+ map1.put("id",users.getId()+"");
	785	+ map1.put("name",users.getName());
	786	+ }
	787	+ antexChuResult.setProdDoctor(map1);
767	788	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
768	789	referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
769	790	antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);

...	...	@@ -65,7 +65,7 @@
65	65	//指导
66	66	private String guide;
67	67	//产检医生
68		- private String checkDoctor;
	68	+ private Map checkDoctor;
69	69	//产检日期
70	70	private String checkDate;
71	71	//下次产检日期
...	...	@@ -143,7 +143,7 @@
143	143	setcDueWeek(destModel.getcDueWeek());
144	144	setChiefComplaint(destModel.getChiefComplaint());
145	145
146		- setCheckDoctor(destModel.getCheckDoctor());
	146	+// setCheckDoctor(destModel.getCheckDoctor());
147	147	setCurrentDueDate(destModel.getCurrentDueDate());
148	148	setGuide(destModel.getGuide());
149	149	setHemoglobin(destModel.getHemoglobin());
150	150
...	...	@@ -210,11 +210,11 @@
210	210	this.checkDate = checkDate;
211	211	}
212	212
213		- public String getCheckDoctor() {
	213	+ public Map getCheckDoctor() {
214	214	return checkDoctor;
215	215	}
216	216
217		- public void setCheckDoctor(String checkDoctor) {
	217	+ public void setCheckDoctor(Map checkDoctor) {
218	218	this.checkDoctor = checkDoctor;
219	219	}
220	220

...	...	@@ -135,7 +135,7 @@
135	135	//指导意见
136	136	private String guide;
137	137	//产检医生
138		- private String prodDoctor;
	138	+ private Map prodDoctor;
139	139	//产检日期
140	140	private String checkTime;
141	141	//下次产检时间
142	142
143	143
...	...	@@ -546,17 +546,14 @@
546	546	this.platelet = platelet;
547	547	}
548	548
549		-
550		-
551		- public String getProdDoctor() {
	549	+ public Map getProdDoctor() {
552	550	return prodDoctor;
553	551	}
554	552
555		- public void setProdDoctor(String prodDoctor) {
	553	+ public void setProdDoctor(Map prodDoctor) {
556	554	this.prodDoctor = prodDoctor;
557	555	}
558	556
559		-
560	557	public Integer getAbortion() {
561	558	return abortion;
562	559	}
...	...	@@ -925,7 +922,7 @@
925	922	// setDiagnosis(antExChuModel.getDiagnosis());
926	923	setTreatOpinion(antExChuModel.getTreatOpinion());
927	924	setGuide(antExChuModel.getDirOpinion());
928		- setProdDoctor(antExChuModel.getProdDoctor());
	925	+// setProdDoctor(antExChuModel.getProdDoctor());
929	926	if(null!=antExChuModel.getCheckTime()){
930	927	setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
931	928	}