Commit e10f26bef1228a8746e1ad5374175f4a9536b464
1 parent
c902bb6c9e
Exists in
master
and in
6 other branches
听力诊断借口调整
Showing 9 changed files with 115 additions and 44 deletions
- .idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
- platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
- platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java
- platform-operate-api/src/main/resources/rebel.xml
- platform-operate-api/src/main/webapp/WEB-INF/web.xml
.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
View file @
e10f26b
1 | 1 | <component name="libraryTable"> |
2 | 2 | <library name="Maven: org.apache.commons:commons-lang3:3.4"> |
3 | 3 | <CLASSES> |
4 | - <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" /> | |
4 | + <root url="jar://D:/mavenRepository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" /> | |
5 | 5 | </CLASSES> |
6 | 6 | <JAVADOC> |
7 | - <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" /> | |
7 | + <root url="jar://D:/mavenRepository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" /> | |
8 | 8 | </JAVADOC> |
9 | 9 | <SOURCES> |
10 | - <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" /> | |
10 | + <root url="jar://D:/mavenRepository/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" /> | |
11 | 11 | </SOURCES> |
12 | 12 | </library> |
13 | 13 | </component> |
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
View file @
e10f26b
platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
View file @
e10f26b
... | ... | @@ -7,6 +7,35 @@ |
7 | 7 | */ |
8 | 8 | public class HdEnums { |
9 | 9 | |
10 | + public enum HandlingSuggestionEnums { | |
11 | + QZNRSF(1, "确诊纳入随访"), | |
12 | + WFXWT(2, "未发现问题"); | |
13 | + | |
14 | + private int id; | |
15 | + private String name; | |
16 | + | |
17 | + HandlingSuggestionEnums(int id, String name) { | |
18 | + this.id = id; | |
19 | + this.name = name; | |
20 | + } | |
21 | + | |
22 | + public int getId() { | |
23 | + return id; | |
24 | + } | |
25 | + | |
26 | + public void setId(int id) { | |
27 | + this.id = id; | |
28 | + } | |
29 | + | |
30 | + public String getName() { | |
31 | + return name; | |
32 | + } | |
33 | + | |
34 | + public void setName(String name) { | |
35 | + this.name = name; | |
36 | + } | |
37 | + } | |
38 | + | |
10 | 39 | public enum IsConfirmEnums { |
11 | 40 | BY(1, "已确诊"), |
12 | 41 | WY(2, "待确诊"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
e10f26b
... | ... | @@ -138,7 +138,7 @@ |
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
141 | - * 随访模块列表管理初始化数据 | |
141 | + * 听力诊断列表管理初始化数据 | |
142 | 142 | * |
143 | 143 | * @return |
144 | 144 | */ |
145 | 145 | |
... | ... | @@ -163,8 +163,32 @@ |
163 | 163 | */ |
164 | 164 | @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") |
165 | 165 | @ResponseBody |
166 | + public BaseResponse initHearingDiagnose() { | |
167 | + | |
168 | + //根据条件查询基础配置信息表 | |
169 | + InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); | |
170 | + initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); | |
171 | + initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); | |
172 | + initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); | |
173 | + initHearingDiagnose.setHandlingSuggestion(EnumUtil.toJson(HdEnums.HandlingSuggestionEnums.class)); | |
174 | + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); | |
175 | + } | |
176 | + | |
177 | + /** | |
178 | + * 进入新增听力诊断页面前,验证及初始化数据 | |
179 | + * | |
180 | + * @return | |
181 | + */ | |
182 | + @RequestMapping(method = RequestMethod.GET, value = "/checkHearingDiagnose") | |
183 | + @ResponseBody | |
166 | 184 | @TokenRequired |
167 | - public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) { | |
185 | + public BaseResponse checkHearingDiagnose(String babyId, HttpServletRequest request) { | |
186 | + //开发--跳过验证 | |
187 | + if(StringUtils.isNotEmpty(babyId)){ | |
188 | + //根据条件查询基础配置信息表 | |
189 | + InitFollowUp aa = new InitFollowUp(); | |
190 | + return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); | |
191 | + } | |
168 | 192 | //获取当前登录用户ID |
169 | 193 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
170 | 194 | if (loginState == null) { |
... | ... | @@ -197,11 +221,11 @@ |
197 | 221 | if(scr.getOaeRight()==null||scr.getOaeLeft()==null||scr.getAabrLeft()==null||scr.getAabrRight()==null){ |
198 | 222 | |
199 | 223 | }else |
200 | - //只要有听筛未通过的就可以进入听诊了 | |
201 | - if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 | |
202 | - isResu = true; | |
203 | - break; | |
204 | - } | |
224 | + //只要有听筛未通过的就可以进入听诊了 | |
225 | + if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 | |
226 | + isResu = true; | |
227 | + break; | |
228 | + } | |
205 | 229 | } |
206 | 230 | if (!isResu) { |
207 | 231 | return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("该儿童还未听筛未通过记录不能进行听诊"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
View file @
e10f26b
... | ... | @@ -317,12 +317,15 @@ |
317 | 317 | } |
318 | 318 | |
319 | 319 | scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); |
320 | + if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){ | |
321 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); | |
322 | + } | |
320 | 323 | |
321 | 324 | //主数据 |
322 | 325 | List<String> babyIds = screenService.queryScrBabyIds(scrQuery); |
323 | 326 | |
324 | 327 | if (babyIds.size() == 0) { |
325 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到数据"); | |
328 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); | |
326 | 329 | } |
327 | 330 | |
328 | 331 | //设置要显示的医院集合(已加入条件本院、外院、全部) |
... | ... | @@ -407,6 +410,9 @@ |
407 | 410 | hd.setBabyId(babyIds.get(i)); |
408 | 411 | int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator()); |
409 | 412 | HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); |
413 | + if (index1 < 0) { | |
414 | + continue; | |
415 | + } | |
410 | 416 | if (index1 >= 0) { |
411 | 417 | hd = hearingDiagnoseList.get(index1); |
412 | 418 | hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊"); |
413 | 419 | |
414 | 420 | |
415 | 421 | |
416 | 422 | |
417 | 423 | |
... | ... | @@ -420,30 +426,36 @@ |
420 | 426 | hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()))); |
421 | 427 | if (hd.getHighFactor() != null) { |
422 | 428 | String hf[] = hd.getHighFactor().split(","); |
423 | - List<Map<Integer, String>> highRiskEnums = new ArrayList<>(); | |
429 | + // List<Map<Integer, String>> highRiskEnums = new ArrayList<>(); | |
430 | + StringBuffer hrSb = new StringBuffer(); | |
424 | 431 | for (int b = 0; b < hf.length; b++) { |
425 | 432 | if (StringUtils.isNotEmpty(hf[b])) { |
426 | 433 | Map<Integer, String> map = new HashMap<>(); |
427 | 434 | String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); |
428 | 435 | map.put(Integer.parseInt(hf[b]), title); |
429 | - highRiskEnums.add(map); | |
436 | + // highRiskEnums.add(map); | |
437 | + hrSb.append(title+","); | |
430 | 438 | } |
431 | 439 | } |
432 | - hea.setHighRiskEnums(highRiskEnums); | |
440 | + // hea.setHighRiskEnums(highRiskEnums); | |
441 | + hea.setHighRiskEnums(hrSb.toString()); | |
433 | 442 | } |
434 | 443 | //确诊结果 |
435 | 444 | if (hd.getConfirmResult() != null) { |
436 | 445 | String cr[] = hd.getConfirmResult().split(","); |
437 | - List<Map<Integer, String>> hdEnums = new ArrayList<>(); | |
446 | + // List<Map<Integer, String>> hdEnums = new ArrayList<>(); | |
447 | + StringBuffer hdSb = new StringBuffer(); | |
438 | 448 | for (int b = 0; b < cr.length; b++) { |
439 | 449 | if (StringUtils.isNotEmpty(cr[b])) { |
440 | 450 | Map<Integer, String> map = new HashMap<>(); |
441 | 451 | String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); |
442 | 452 | map.put(Integer.parseInt(cr[b]), title); |
443 | - hdEnums.add(map); | |
453 | + // hdEnums.add(map); | |
454 | + hdSb.append(title+","); | |
444 | 455 | } |
445 | 456 | } |
446 | - hea.setDiagnResult(hdEnums); | |
457 | + // hea.setDiagnResult(hdEnums); | |
458 | + hea.setDiagnResult(hdSb.toString()); | |
447 | 459 | } |
448 | 460 | } |
449 | 461 | BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); |
... | ... | @@ -588,6 +600,7 @@ |
588 | 600 | */ |
589 | 601 | @RequestMapping(method = RequestMethod.POST, value = "/saveHearingDiagnose") |
590 | 602 | @ResponseBody |
603 | + @TokenRequired | |
591 | 604 | public BaseResponse addHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj, |
592 | 605 | HttpServletRequest request) { |
593 | 606 | //获取当前登录用户ID |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java
View file @
e10f26b
1 | 1 | package com.lyms.platform.operate.web.result; |
2 | 2 | |
3 | -import java.util.List; | |
4 | -import java.util.Map; | |
5 | - | |
6 | 3 | /** |
7 | 4 | * 听力诊断列表 |
8 | 5 | * Created by yf on 2017/5/11. |
... | ... | @@ -23,7 +20,7 @@ |
23 | 20 | //性别 |
24 | 21 | private String sex; |
25 | 22 | //诊断结果 |
26 | - private List<Map<Integer,String>> diagnResult; | |
23 | + private String diagnResult; | |
27 | 24 | //是否确诊 0-待确诊,1-确诊 |
28 | 25 | private String isconfirm; |
29 | 26 | //创建时间 |
30 | 27 | |
... | ... | @@ -35,16 +32,8 @@ |
35 | 32 | //母亲加密联系方式 |
36 | 33 | private String mommnyEncryptPhone; |
37 | 34 | //听力高危集合 |
38 | - private List<Map<Integer,String>> highRiskEnums; | |
35 | + private String highRiskEnums; | |
39 | 36 | |
40 | - public List<Map<Integer, String>> getHighRiskEnums() { | |
41 | - return highRiskEnums; | |
42 | - } | |
43 | - | |
44 | - public void setHighRiskEnums(List<Map<Integer, String>> highRiskEnums) { | |
45 | - this.highRiskEnums = highRiskEnums; | |
46 | - } | |
47 | - | |
48 | 37 | public String getId() { |
49 | 38 | return id; |
50 | 39 | } |
... | ... | @@ -81,6 +70,18 @@ |
81 | 70 | return birthday; |
82 | 71 | } |
83 | 72 | |
73 | + public void setDiagnResult(String diagnResult) { | |
74 | + this.diagnResult = diagnResult; | |
75 | + } | |
76 | + | |
77 | + public String getHighRiskEnums() { | |
78 | + return highRiskEnums; | |
79 | + } | |
80 | + | |
81 | + public void setHighRiskEnums(String highRiskEnums) { | |
82 | + this.highRiskEnums = highRiskEnums; | |
83 | + } | |
84 | + | |
84 | 85 | public void setBirthday(String birthday) { |
85 | 86 | this.birthday = birthday; |
86 | 87 | } |
87 | 88 | |
... | ... | @@ -101,17 +102,12 @@ |
101 | 102 | this.sex = sex; |
102 | 103 | } |
103 | 104 | |
104 | - | |
105 | - public List<Map<Integer, String>> getDiagnResult() { | |
106 | - return diagnResult; | |
107 | - } | |
108 | - | |
109 | - public void setDiagnResult(List<Map<Integer, String>> diagnResult) { | |
110 | - this.diagnResult = diagnResult; | |
111 | - } | |
112 | - | |
113 | 105 | public String getIsconfirm() { |
114 | 106 | return isconfirm; |
107 | + } | |
108 | + | |
109 | + public String getDiagnResult() { | |
110 | + return diagnResult; | |
115 | 111 | } |
116 | 112 | |
117 | 113 | public void setIsconfirm(String isconfirm) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java
View file @
e10f26b
... | ... | @@ -17,6 +17,16 @@ |
17 | 17 | private List<Map<String,Object>> hearingDiagnosis; |
18 | 18 | //确诊结果 |
19 | 19 | private List<Map<String,Object>> confirmResult; |
20 | + //处理意见 | |
21 | + private List<Map<String,Object>> handlingSuggestion; | |
22 | + | |
23 | + public List<Map<String, Object>> getHandlingSuggestion() { | |
24 | + return handlingSuggestion; | |
25 | + } | |
26 | + | |
27 | + public void setHandlingSuggestion(List<Map<String, Object>> handlingSuggestion) { | |
28 | + this.handlingSuggestion = handlingSuggestion; | |
29 | + } | |
20 | 30 | |
21 | 31 | public List<Map<String, Object>> getHighRiskConfirms() { |
22 | 32 | return highRiskConfirms; |
platform-operate-api/src/main/resources/rebel.xml
View file @
e10f26b
... | ... | @@ -2,13 +2,13 @@ |
2 | 2 | <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd"> |
3 | 3 | |
4 | 4 | <classpath> |
5 | - <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes"> | |
5 | + <dir name="D:/lyms_work/regional-platform/platform-operate-api/target/classes"> | |
6 | 6 | </dir> |
7 | 7 | </classpath> |
8 | 8 | |
9 | 9 | <web> |
10 | 10 | <link target="/"> |
11 | - <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp"> | |
11 | + <dir name="D:/lyms_work/regional-platform/platform-operate-api/src/main/webapp"> | |
12 | 12 | </dir> |
13 | 13 | </link> |
14 | 14 | </web> |
platform-operate-api/src/main/webapp/WEB-INF/web.xml
View file @
e10f26b
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 | version="2.5" |
14 | 14 | xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> |
15 | 15 | <!--start跨域开始--> |
16 | -<!-- | |
16 | + | |
17 | 17 | <filter> |
18 | 18 | <filter-name>CorsFilter</filter-name> |
19 | 19 | <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> |
... | ... | @@ -46,7 +46,6 @@ |
46 | 46 | <filter-name>CorsFilter</filter-name> |
47 | 47 | <url-pattern>/*</url-pattern> |
48 | 48 | </filter-mapping> |
49 | ---> | |
50 | 49 | <!--end跨域结束--> |
51 | 50 | |
52 | 51 | <servlet-mapping> |