jiangjiazhi / regional-platform

Commit 36b368662ff104da4de83f4d2fe7a41c923a8302

Authored by yangfei almost 9 years ago

Exists in master and in 6 other branches

产检医生统计

Showing 3 changed files with 82 additions and 75 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java

...	...	@@ -116,19 +116,30 @@
116	116	fuResult.setArtifiCochlea(followUp.getArtifiCochlea());
117	117	fuResult.setGuideOpinion(followUp.getGuideOpinion());
118	118	fuResult.setMonthAge(followUp.getMonthAge());
	119	+ fuResult.setIsArtifiCochlea(followUp.getIsArtifiCochlea());
	120	+ fuResult.setIsAudiphone(followUp.getIsAudiphone());
	121	+ fuResult.setIsOperation(followUp.getIsOperation());
119	122
120	123
	124	+ StringBuffer interStrate = new StringBuffer();
	125	+
121	126	if(followUp.getAudiphone()!=null){
122	127	//1-左耳，2-右耳，3-全部
123		- fuResult.setAudiphoneStr(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部");
	128	+ interStrate.append("助听器:"+(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部"));
124	129	}
125	130	if(followUp.getOperation()!=null){
126	131	//1-左耳，2-右耳，3-全部
127		- fuResult.setOperationStr(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部");
	132	+ if(StringUtils.isNotEmpty(interStrate.toString())){//如果不为空
	133	+ interStrate.append(",");
	134	+ }
	135	+ interStrate.append("手术："+(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部"));
128	136	}
129	137	if(followUp.getArtifiCochlea()!=null){
130	138	//1-左耳，2-右耳，3-全部
131		- fuResult.setArtifiCochleaStr(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部");
	139	+ if(StringUtils.isNotEmpty(interStrate.toString())){//如果不为空
	140	+ interStrate.append(",");
	141	+ }
	142	+ interStrate.append("人工耳蜗："+(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部"));
132	143	}
133	144
134	145	if(StringUtils.isNotEmpty(followUp.getFollowDoctorId())){
135	146
136	147
...	...	@@ -142,17 +153,18 @@
142	153
143	154	//随访时间
144	155	if(followUp.getFollowTime()!=null){
145		- fuResult.setFollowTime(followUp.getFollowTime());
146		- fuResult.setFollowTimeStr(DateUtil.getyyyy_MM_dd(followUp.getFollowTime()));
	156	+ fuResult.setFollowTime(DateUtil.getyyyy_MM_dd(followUp.getFollowTime()));
	157	+ BabyModel babyModel = babyService.getOneBabyById(followUp.getBabyId());
	158	+ if (babyModel != null) {
	159	+ fuResult.setcMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), followUp.getFollowTime()));
	160	+ }
147	161	}
148	162	if(followUp.getMarkTime()!=null){
149		- fuResult.setMarkTime(followUp.getMarkTime());
150		- fuResult.setMarkTimeStr(DateUtil.getyyyy_MM_dd(followUp.getMarkTime()));
	163	+ fuResult.setMarkTime(DateUtil.getyyyy_MM_dd(followUp.getMarkTime()));
151	164	}
152	165
153	166	if(followUp.getNextTime()!=null){
154		- fuResult.setNextTime(followUp.getNextTime());
155		- fuResult.setNextTimeStr(DateUtil.getyyyy_MM_dd(followUp.getNextTime()));
	167	+ fuResult.setNextTime(DateUtil.getyyyy_MM_dd(followUp.getNextTime()));
156	168	}
157	169	if(followUp.getIfclose()!=null){
158	170	fuResult.setIfclose(followUp.getIfclose());
...	...	@@ -310,7 +322,7 @@
310	322	res.setMommyName(mb.getMname());
311	323	if(fu.getFollowTime()!=null){
312	324	//根据诊断时间获取月龄
313		- res.setMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(), fu.getFollowTime()));
	325	+ res.setcMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(), fu.getFollowTime()));
314	326	}
315	327	res.setBirthday(DateUtil.getyyyy_MM_dd(mb.getBirth()));
316	328	res.setSex(mb.getSex() == 0 ? "女" : mb.getSex() == 1 ? "男" : "未知");
...	...	@@ -387,7 +399,7 @@
387	399	}
388	400	//医院id
389	401	String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
390		- BabyModel follow = babyService.getOneBabyById(obj.getId());
	402	+ BabyPatientExtendEarFollowUp follow = babyPatientExtendEarFollowUpService.getBabyPatientExtendEarFollowUp(obj.getId());
391	403	if (follow == null) {//
392	404	return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要修改的数据");
393	405	}

...	...	@@ -32,7 +32,18 @@
32	32	private String mommnyPhone;
33	33	//母亲加密联系方式
34	34	private String mommnyEncryptPhone;
	35	+ /**
	36	+ * 当前月龄
	37	+ */
	38	+ private String cMonthAge;
35	39
	40	+ public String getcMonthAge() {
	41	+ return cMonthAge;
	42	+ }
	43	+
	44	+ public void setcMonthAge(String cMonthAge) {
	45	+ this.cMonthAge = cMonthAge;
	46	+ }
36	47	public String getMommnyEncryptPhone() {
37	48	return mommnyEncryptPhone;
38	49	}

1	1	package com.lyms.platform.operate.web.result;
2	2
3		-import java.util.Date;
4		-
5	3	/**
6	4	* @auther yangfei
7	5	* @createTime 2017年05月25日 09时29分
8	6
9	7
10	8
...	...	@@ -19,24 +17,16 @@
19	17	/**
20	18	* 随访时间
21	19	*/
22		- private Date followTime;
	20	+ private String followTime;
23	21	/**
24		- * 随访时间
25		- */
26		- private String followTimeStr;
27		- /**
28	22	* 随访地点
29	23	*/
30	24	private String followAddr;
31	25	/**
32	26	* 确诊时间
33	27	*/
34		- private Date markTime;
	28	+ private String markTime;
35	29	/**
36		- * 确诊时间
37		- */
38		- private String markTimeStr;
39		- /**
40	30	* 确诊结果
41	31	*/
42	32	private String markResult;
...	...	@@ -48,6 +38,7 @@
48	38	* 随访记录
49	39	*/
50	40	private String followInfo;
	41	+ private String interStrate;
51	42	/**
52	43	* 助听器(0-左耳，2-右耳，3-全部)
53	44	*/
54	45
...	...	@@ -90,12 +81,8 @@
90	81	/**
91	82	* 预约复查时间
92	83	*/
93		- private Date nextTime;
	84	+ private String nextTime;
94	85	/**
95		- * 预约复查时间
96		- */
97		- private String nextTimeStr;
98		- /**
99	86	* 是否结案 0-未结案，1-结案
100	87	*/
101	88	private Integer ifclose;
102	89
...	...	@@ -115,7 +102,19 @@
115	102	* 月龄
116	103	*/
117	104	private Integer monthAge;
	105	+ /**
	106	+ * 当前月龄
	107	+ */
	108	+ private String cMonthAge;
118	109
	110	+ public String getcMonthAge() {
	111	+ return cMonthAge;
	112	+ }
	113	+
	114	+ public void setcMonthAge(String cMonthAge) {
	115	+ this.cMonthAge = cMonthAge;
	116	+ }
	117	+
119	118	public String getAudiphoneStr() {
120	119	return audiphoneStr;
121	120	}
...	...	@@ -124,6 +123,14 @@
124	123	this.audiphoneStr = audiphoneStr;
125	124	}
126	125
	126	+ public String getInterStrate() {
	127	+ return interStrate;
	128	+ }
	129	+
	130	+ public void setInterStrate(String interStrate) {
	131	+ this.interStrate = interStrate;
	132	+ }
	133	+
127	134	public String getOperationStr() {
128	135	return operationStr;
129	136	}
130	137
...	...	@@ -156,22 +163,7 @@
156	163	this.babyId = babyId;
157	164	}
158	165
159		- public Date getFollowTime() {
160		- return followTime;
161		- }
162	166
163		- public void setFollowTime(Date followTime) {
164		- this.followTime = followTime;
165		- }
166		-
167		- public String getFollowTimeStr() {
168		- return followTimeStr;
169		- }
170		-
171		- public void setFollowTimeStr(String followTimeStr) {
172		- this.followTimeStr = followTimeStr;
173		- }
174		-
175	167	public String getFollowAddr() {
176	168	return followAddr;
177	169	}
...	...	@@ -180,22 +172,6 @@
180	172	this.followAddr = followAddr;
181	173	}
182	174
183		- public Date getMarkTime() {
184		- return markTime;
185		- }
186		-
187		- public void setMarkTime(Date markTime) {
188		- this.markTime = markTime;
189		- }
190		-
191		- public String getMarkTimeStr() {
192		- return markTimeStr;
193		- }
194		-
195		- public void setMarkTimeStr(String markTimeStr) {
196		- this.markTimeStr = markTimeStr;
197		- }
198		-
199	175	public String getMarkResult() {
200	176	return markResult;
201	177	}
...	...	@@ -268,22 +244,6 @@
268	244	this.followDoctorId = followDoctorId;
269	245	}
270	246
271		- public Date getNextTime() {
272		- return nextTime;
273		- }
274		-
275		- public void setNextTime(Date nextTime) {
276		- this.nextTime = nextTime;
277		- }
278		-
279		- public String getNextTimeStr() {
280		- return nextTimeStr;
281		- }
282		-
283		- public void setNextTimeStr(String nextTimeStr) {
284		- this.nextTimeStr = nextTimeStr;
285		- }
286		-
287	247	public Integer getIfclose() {
288	248	return ifclose;
289	249	}
...	...	@@ -346,6 +306,30 @@
346	306
347	307	public void setMonthAge(Integer monthAge) {
348	308	this.monthAge = monthAge;
	309	+ }
	310	+
	311	+ public String getFollowTime() {
	312	+ return followTime;
	313	+ }
	314	+
	315	+ public void setFollowTime(String followTime) {
	316	+ this.followTime = followTime;
	317	+ }
	318	+
	319	+ public String getMarkTime() {
	320	+ return markTime;
	321	+ }
	322	+
	323	+ public void setMarkTime(String markTime) {
	324	+ this.markTime = markTime;
	325	+ }
	326	+
	327	+ public String getNextTime() {
	328	+ return nextTime;
	329	+ }
	330	+
	331	+ public void setNextTime(String nextTime) {
	332	+ this.nextTime = nextTime;
349	333	}
350	334	}