jiangjiazhi / regional-platform

Commit 9185b11347f853309d21a6bf88443abab5de182d

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 4 changed files with 22 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java
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/controller/HearDiagnManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java

...	...	@@ -8,28 +8,28 @@
8	8	*/
9	9	public enum HearingDiagnosisEnums {
10	10	DEQDGYSJXLZE(1,"单耳轻度感音神经性聋(左耳)"),
11		- DEQDGYSJXLYE(17,"单耳轻度感音神经性聋（右耳）"),
	11	+ DEQDGYSJXLYE(17,"单耳轻度感音神经性聋(右耳)"),
12	12	SEQDGYSJXL(2,"双耳轻度感音神经性聋"),
13	13	DEQDCDXLHBZEYZE(3,"单耳轻度传导性聋合并中耳炎(左耳)"),
14		- DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎（右耳）"),
	14	+ DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎(右耳)"),
15	15	SEQDCDXLHBZEY(4,"双耳轻度传导性聋合并中耳炎"),
16	16	DEZDGYSJXLZE(5,"单耳中度感音神经性聋(左耳)"),
17		- DEZDGYSJXLYE(19,"单耳中度感音神经性聋（右耳）"),
	17	+ DEZDGYSJXLYE(19,"单耳中度感音神经性聋(右耳)"),
18	18	SEZDGYSJXL(6,"双耳中度感音神经性聋"),
19	19	DEZDCDXLHBZEYZE(7,"单耳中度传导性聋合并中耳炎(左耳)"),
20		- DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎（右耳）"),
	20	+ DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎(右耳)"),
21	21	SEZDCDXLHBZEY(8,"双耳中度传导性聋合并中耳炎"),
22	22	DEZZDGYSJXLZE(9,"单耳中重度感音神经性聋(左耳)"),
23		- DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋（右耳）"),
	23	+ DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋(右耳)"),
24	24	SEZZDGYSJXL(10,"双耳中重度感音神经性聋"),
25	25	DEZZDCDXLHBZEYZE(11,"单耳中重度传导性聋合并中耳炎(左耳)"),
26		- DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎（右耳）"),
	26	+ DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎(右耳)"),
27	27	SEZZDCDXLHBZEY(12,"双耳中重度传导性聋合并中耳炎"),
28	28	DEZZGYSJXLZE(13,"单耳重度感音神经性聋(左耳)"),
29		- DEZZGYSJXLYE(23,"单耳重度感音神经性聋（右耳）"),
	29	+ DEZZGYSJXLYE(23,"单耳重度感音神经性聋(右耳)"),
30	30	SEZDGYSJXLS(14,"双耳重度感音神经性聋"),
31	31	DEJZDGYSJXLZE(15,"单耳极重度感音神经性聋(左耳)"),
32		- DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋（右耳）"),
	32	+ DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋(右耳)"),
33	33	SEJZDGYSJXL(16,"双耳极重度感音神经性聋");
34	34	private int id;
35	35	private String name;

...	...	@@ -127,11 +127,17 @@
127	127	if (StringUtils.isNotEmpty(cr[b])) {
128	128	Map<Integer, String> map = new HashMap<>();
129	129	String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
130		- mrSb.append(title+",");
	130	+ mrSb.append(title+"、");
131	131	}
132	132	}
	133	+ String hfString = null;
	134	+ if (mrSb.toString().endsWith("、")) {
	135	+ hfString = mrSb.substring(0, mrSb.length() - 1);
	136	+ } else {
	137	+ hfString = mrSb.toString();
	138	+ }
133	139	//设置确诊结果
134		- fuResult.setMarkResultStr(mrSb.toString());
	140	+ fuResult.setMarkResultStr(hfString);
135	141	}
136	142	fuResult.setMarkResult(followUp.getMarkResult());
137	143	fuResult.setMarkDetail(followUp.getMarkDetail());

...	...	@@ -83,7 +83,7 @@
83	83	}
84	84	//当前登录人医院Id
85	85	String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
86		-
	86	+ //获取机构内同一儿童babyIds
87	87	List<String> babyIds = earFacade.getBabyIdsByItemOrg(babyId,hospitalId);
88	88
89	89
...	...	@@ -102,7 +102,7 @@
102	102
103	103	//儿童听力随访记录
104	104	BabyPatientExtendEarFollowUpQuery earFollowUpQuery = new BabyPatientExtendEarFollowUpQuery();
105		- earFollowUpQuery.setBabyId(babyId);
	105	+ earFollowUpQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
106	106	earFollowUpQuery.setIfdel(0);
107	107	earFollowUpQuery.setSort("follow_time");
108	108	List<BabyPatientExtendEarFollowUp> earFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUpByBaby(earFollowUpQuery);

...	...	@@ -784,7 +784,10 @@
784	784
785	785	//医院id
786	786	String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
787		-
	787	+ //确诊加入确诊时间
	788	+ if(obj.getIsconfirm()==1){
	789	+ obj.setConfirmTime(new Date());
	790	+ }
788	791	obj.setIfdel(0);
789	792	obj.setCreateTime(new Date());
790	793	obj.setCreateId(String.valueOf(loginState.getId()));