jiangjiazhi / regional-platform

Commit e4411c5e7afa0c33be705b40a21a7bcaa4224732

Authored by wtt about 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 58 additions and 77 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyStuntingModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStuntingRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java

...	...	@@ -26,12 +26,7 @@
26	26	private Date createDate;
27	27	private Date modifyDate;
28	28	private String hospitalId;
29		- //备注
30		- private String mremark;
31		- // 母亲高危因素
32		- List<String> mHighRiskReason;
33	29
34		-
35	30	/母亲信息/
36	31	//母亲姓名
37	32	private String mname;
...	...	@@ -679,22 +674,6 @@
679	674
680	675	public void setHospitalId(String hospitalId) {
681	676	this.hospitalId = hospitalId;
682		- }
683		-
684		- public String getMremark() {
685		- return mremark;
686		- }
687		-
688		- public void setMremark(String mremark) {
689		- this.mremark = mremark;
690		- }
691		-
692		- public List <String> getmHighRiskReason() {
693		- return mHighRiskReason;
694		- }
695		-
696		- public void setmHighRiskReason(List <String> mHighRiskReason) {
697		- this.mHighRiskReason = mHighRiskReason;
698	677	}
699	678
700	679	public String getMname() {

...	...	@@ -344,6 +344,13 @@
344	344	if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) {
345	345	babyNutritionSpecialtyResult.setHospitalName(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService));
346	346	}
	347	+
	348	+ if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())) {
	349	+ Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor()));
	350	+ if (users != null && StringUtils.isNotEmpty(users.getName())) {
	351	+ babyNutritionSpecialtyResult.setCheckDoctor(users.getName());
	352	+ }
	353	+ }
347	354	babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult);
348	355	}
349	356	}
...	...	@@ -392,6 +399,13 @@
392	399	if (babyNutritionSpecialtyModel != null) {
393	400	babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel);
394	401	babyNutritionSpecialtyResult.setHospitalId(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService));
	402	+ if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCaseClosed())){
	403	+ String caseClosed = babyNutritionSpecialtyModel.getCaseClosed();
	404	+ babyNutritionSpecialtyResult.setCaseClosed("1".equals(caseClosed)?"是":"否");
	405	+ }else {
	406	+ babyNutritionSpecialtyResult.setCaseClosed(null);
	407	+ }
	408	+
395	409	babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult);
396	410	}
397	411	}

...	...	@@ -96,8 +96,6 @@
96	96	model.setsINCard(babyModel.getsINCard());
97	97	model.setBirthday(babyModel.getBirth());
98	98	model.setModifyDate(new Date());
99		- model.setMremark(babyModel.getMremark());
100		- model.setmHighRiskReason(babyModel.getmHighRiskReason());
101	99
102	100	//createDate,hospitalId调用外添加赋值
103	101	}
...	...	@@ -259,10 +257,6 @@
259	257	BabyStuntingResult babyStuntingResult = new BabyStuntingResult();
260	258	babyStuntingResult.convertToShowResult(babyStuntingModel);
261	259
262		- // 母亲高危因素
263		- if (CollectionUtils.isNotEmpty(babyStuntingModel.getmHighRiskReason())) {
264		- babyStuntingResult.setmHighRiskReason(mongoUtil.findColor(babyStuntingModel.getmHighRiskReason()));
265		- }
266	260	//检查医生
267	261	if (StringUtils.isNotEmpty(babyStuntingResult.getCheckDoctor())) {
268	262	Users users = usersService.getUsers(NumberUtils.toInt(babyStuntingModel.getCheckDoctor()));

...	...	@@ -25,12 +25,8 @@
25	25	private String createDate;
26	26	private String modifyDate;
27	27	private String hospitalId;
28		- //备注
29		- private String mremark;
30		- // 母亲高危因素
31		- List<String> mHighRiskReason;
	28	+ private String hospitalName;
32	29
33		-
34	30	/母亲信息/
35	31	//母亲姓名
36	32	private String mname;
...	...	@@ -69,6 +65,7 @@
69	65	private String nextDate;
70	66	//发育迟缓专科检查 cz初诊，fz复诊
71	67	private String czOrfzProject;
	68	+ private String czOrfzProjectName;
72	69
73	70	/新增页面 2个页面内容/
74	71	//病历编号手动输入必填项
...	...	@@ -79,6 +76,7 @@
79	76	//儿童家庭住址省市县区具体
80	77	//居住地
81	78	private String addr; //地址
	79	+ private String addrStr; //地址
82	80	private String provinceId;//省
83	81	private String cityId;//市
84	82	private String areaId;//区
...	...	@@ -109,6 +107,8 @@
109	107	/既往史/
110	108	// （多选）nws:true 脑外伤，lngr:true 颅内感染 zl:true 肿瘤 yybl:true 营养不良 fp:true 肥胖 xlsh:true 心理伤害
111	109	private Map<String, Object> jws;
	110	+ private String jwsStr;
	111	+
112	112	//其他
113	113	private String jwsqt;
114	114
115	115
116	116
...	...	@@ -191,9 +191,30 @@
191	191	private String gyzd;
192	192
193	193
194		- /新增页面 4个页面内容/
	194	+ public String getHospitalName() {
	195	+ return hospitalName;
	196	+ }
195	197
	198	+ public void setHospitalName(String hospitalName) {
	199	+ this.hospitalName = hospitalName;
	200	+ }
196	201
	202	+ public String getCzOrfzProjectName() {
	203	+ return czOrfzProjectName;
	204	+ }
	205	+
	206	+ public void setCzOrfzProjectName(String czOrfzProjectName) {
	207	+ this.czOrfzProjectName = czOrfzProjectName;
	208	+ }
	209	+
	210	+ public String getJwsStr() {
	211	+ return jwsStr;
	212	+ }
	213	+
	214	+ public void setJwsStr(String jwsStr) {
	215	+ this.jwsStr = jwsStr;
	216	+ }
	217	+
197	218	public String getCreateDate() {
198	219	return createDate;
199	220	}
200	221
...	...	@@ -210,13 +231,7 @@
210	231	this.modifyDate = modifyDate;
211	232	}
212	233
213		- public List <String> getmHighRiskReason() {
214		- return mHighRiskReason;
215		- }
216	234
217		- public void setmHighRiskReason(List <String> mHighRiskReason) {
218		- this.mHighRiskReason = mHighRiskReason;
219		- }
220	235
221	236	public Integer getSex() {
222	237	return sex;
223	238
...	...	@@ -684,14 +699,7 @@
684	699	this.gyzd = gyzd;
685	700	}
686	701
687		- public String getMremark() {
688		- return mremark;
689		- }
690	702
691		- public void setMremark(String mremark) {
692		- this.mremark = mremark;
693		- }
694		-
695	703	public String getId() {
696	704	return id;
697	705	}
698	706
...	...	@@ -812,8 +820,12 @@
812	820	this.checkDoctor = checkDoctor;
813	821	}
814	822
	823	+ public String getAddrStr() {
	824	+ return addrStr;
	825	+ }
815	826
816		-
817		-
	827	+ public void setAddrStr(String addrStr) {
	828	+ this.addrStr = addrStr;
	829	+ }
818	830	}

...	...	@@ -7,8 +7,6 @@
7	7	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
8	8	import com.lyms.platform.pojo.BabyStuntingModel;
9	9
10		-import java.util.Date;
11		-import java.util.List;
12	10	import java.util.Map;
13	11
14	12	public class BabyStuntingResult implements IBasicResultConvert<BabyStuntingResult, BabyStuntingModel> {
15	13
...	...	@@ -19,14 +17,11 @@
19	17	private Integer yn;
20	18	private String buildId;
21	19	private String pid;
22		- private Date createDate;
23		- private Date modifyDate;
	20	+ private String createDate;
	21	+ private String modifyDate;
24	22	private String hospitalId;
25	23	private String hospitalName;
26		- //备注
27		- private String mremark;
28		- // 母亲高危因素
29		- List<Map<String,Object>> mHighRiskReason;
	24	+
30	25	/母亲信息/
31	26	//母亲姓名
32	27	private String mname;
33	28
...	...	@@ -50,10 +45,8 @@
50	45	private String sINCard;
51	46	//儿童生日
52	47	private String birthday;
	48	+
53	49	/新增页面，公共内容/
54		- //发育迟缓专科检查 cz初诊，fz复诊
55		- private String czOrfzProject;
56		- private String czOrfzProjectName;
57	50	//检查日期
58	51	private String checkDate;
59	52	//检查月龄 2月龄28天
...	...	@@ -62,6 +55,9 @@
62	55	private String checkDoctor;
63	56	//下次预约
64	57	private String nextDate;
	58	+ //发育迟缓专科检查 cz初诊，fz复诊
	59	+ private String czOrfzProject;
	60	+ private String czOrfzProjectName;
65	61
66	62	/新增页面 4个页面内容/
67	63	//病历编号手动输入必填项
68	64
69	65
70	66
...	...	@@ -218,19 +214,19 @@
218	214	this.pid = pid;
219	215	}
220	216
221		- public Date getCreateDate() {
	217	+ public String getCreateDate() {
222	218	return createDate;
223	219	}
224	220
225		- public void setCreateDate(Date createDate) {
	221	+ public void setCreateDate(String createDate) {
226	222	this.createDate = createDate;
227	223	}
228	224
229		- public Date getModifyDate() {
	225	+ public String getModifyDate() {
230	226	return modifyDate;
231	227	}
232	228
233		- public void setModifyDate(Date modifyDate) {
	229	+ public void setModifyDate(String modifyDate) {
234	230	this.modifyDate = modifyDate;
235	231	}
236	232
237	233
...	...	@@ -250,21 +246,7 @@
250	246	this.hospitalName = hospitalName;
251	247	}
252	248
253		- public String getMremark() {
254		- return mremark;
255		- }
256	249
257		- public void setMremark(String mremark) {
258		- this.mremark = mremark;
259		- }
260		-
261		- public List <Map <String, Object>> getmHighRiskReason() {
262		- return mHighRiskReason;
263		- }
264		-
265		- public void setmHighRiskReason(List <Map <String, Object>> mHighRiskReason) {
266		- this.mHighRiskReason = mHighRiskReason;
267		- }
268	250
269	251	public String getMname() {
270	252	return mname;