Commit f7720d7a5d2707726b2136c630ae29a43e839ba9
1 parent
f8502f91c7
Exists in
master
and in
6 other branches
听力诊断模块
Showing 2 changed files with 13 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
f7720d7
| ... | ... | @@ -150,7 +150,7 @@ |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | //最后一次听诊时间 |
| 153 | - BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1); | |
| 153 | + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size() - 1); | |
| 154 | 154 | String diagnoseDate = DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime()); |
| 155 | 155 | initHearingDiagnose.setDiagnoseDate(diagnoseDate); |
| 156 | 156 | //根据条件查询基础配置信息表 |
| 157 | 157 | |
| ... | ... | @@ -215,9 +215,9 @@ |
| 215 | 215 | //第一次 |
| 216 | 216 | BabyModel babyModel = babyService.getOneBabyById(babyId); |
| 217 | 217 | String buildDate = DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()); |
| 218 | - Map<String,String> data = new HashMap<>(); | |
| 218 | + Map<String, String> data = new HashMap<>(); | |
| 219 | 219 | BaseResponse resObj = new BaseResponse(); |
| 220 | - data.put("buildDate",buildDate); | |
| 220 | + data.put("buildDate", buildDate); | |
| 221 | 221 | resObj.setObject(data); |
| 222 | 222 | return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); |
| 223 | 223 | } |
| ... | ... | @@ -317,7 +317,7 @@ |
| 317 | 317 | babyPatientExtendEarQuery.setPersonId(pid); |
| 318 | 318 | // babyPatientExtendEarQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); |
| 319 | 319 | List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery); |
| 320 | - for(BabyPatientExtendEar es : ears){ | |
| 320 | + for (BabyPatientExtendEar es : ears) { | |
| 321 | 321 | babyIds.add(es.getBabyPatientId()); |
| 322 | 322 | } |
| 323 | 323 | |
| ... | ... | @@ -327,7 +327,7 @@ |
| 327 | 327 | // d、本院：初筛未通过或复筛确诊 |
| 328 | 328 | List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query); |
| 329 | 329 | //最后一次听筛时间 |
| 330 | - Map<String,String> data = new HashMap<>(); | |
| 330 | + Map<String, String> data = new HashMap<>(); | |
| 331 | 331 | if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录 |
| 332 | 332 | //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 |
| 333 | 333 | HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); |
| 334 | 334 | |
| ... | ... | @@ -347,9 +347,9 @@ |
| 347 | 347 | if (!isResu) { |
| 348 | 348 | return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断"); |
| 349 | 349 | } |
| 350 | - BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size()-1); | |
| 350 | + BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size() - 1); | |
| 351 | 351 | String screenDate = DateUtil.getyyyy_MM_dd(earScreen.getScreenDate()); |
| 352 | - data.put("screenDate",screenDate); | |
| 352 | + data.put("screenDate", screenDate); | |
| 353 | 353 | } |
| 354 | 354 | BaseResponse resObj = new BaseResponse(); |
| 355 | 355 | resObj.setObject(data); |
| ... | ... | @@ -401,7 +401,7 @@ |
| 401 | 401 | query.setCheckHospitalId(hospitalId); |
| 402 | 402 | query.setBabyId(babyId); |
| 403 | 403 | query.setStatus(0); |
| 404 | - query.setSort("create_date"); | |
| 404 | + query.setSort("screen_date"); | |
| 405 | 405 | // d、本院：初筛未通过或复筛确诊 |
| 406 | 406 | List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query); |
| 407 | 407 | if (screenList == null && screenList.size() == 0) { |
| ... | ... | @@ -414,10 +414,8 @@ |
| 414 | 414 | //取复筛记录最后一条结果 |
| 415 | 415 | BabyPatientExtendEarScreen endScreen = null; |
| 416 | 416 | for (BabyPatientExtendEarScreen es : screenList) { |
| 417 | - if (firstScreen == null) { | |
| 418 | - if (es.getScreenType() == 1) { | |
| 419 | - firstScreen = es; | |
| 420 | - } | |
| 417 | + if (es.getScreenType() == 1) { | |
| 418 | + firstScreen = es; | |
| 421 | 419 | } |
| 422 | 420 | if (es.getScreenType() == 2) { |
| 423 | 421 | endScreen = es; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java
View file @
f7720d7
| ... | ... | @@ -200,7 +200,7 @@ |
| 200 | 200 | BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); |
| 201 | 201 | query.setCheckHospitalId(hospitalId); |
| 202 | 202 | query.setBabyId(hc.getTargetId()); |
| 203 | - query.setSort("create_date"); | |
| 203 | + query.setSort("screen_date"); | |
| 204 | 204 | // d、本院：初筛未通过或复筛确诊 |
| 205 | 205 | List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query); |
| 206 | 206 | //根据医院ID和babyid查询听筛初筛第一条记录和复筛最后一条记录进行并集。前端显示 |
| ... | ... | @@ -210,10 +210,8 @@ |
| 210 | 210 | //取复筛记录最后一条结果 |
| 211 | 211 | BabyPatientExtendEarScreen endScreen = null; |
| 212 | 212 | for (BabyPatientExtendEarScreen es : screenList) { |
| 213 | - if (firstScreen == null) { | |
| 214 | - if (es.getScreenType() == 1) { | |
| 215 | - firstScreen = es; | |
| 216 | - } | |
| 213 | + if (es.getScreenType() == 1) { | |
| 214 | + firstScreen = es; | |
| 217 | 215 | } |
| 218 | 216 | if (es.getScreenType() == 2) { |
| 219 | 217 | endScreen = es; |