From f7720d7a5d2707726b2136c630ae29a43e839ba9 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 31 Aug 2017 01:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/EarController.java | 22 ++++++++++------------ .../HighriskChangeHospitalController.java | 8 +++----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 6f134d0..84daed1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -150,7 +150,7 @@ public class EarController extends BaseController { } //最后一次听诊时间 - BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1); + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size() - 1); String diagnoseDate = DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime()); initHearingDiagnose.setDiagnoseDate(diagnoseDate); //根据条件查询基础配置信息表 @@ -215,9 +215,9 @@ public class EarController extends BaseController { //第一次 BabyModel babyModel = babyService.getOneBabyById(babyId); String buildDate = DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()); - Map data = new HashMap<>(); + Map data = new HashMap<>(); BaseResponse resObj = new BaseResponse(); - data.put("buildDate",buildDate); + data.put("buildDate", buildDate); resObj.setObject(data); return resObj.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } @@ -317,7 +317,7 @@ public class EarController extends BaseController { babyPatientExtendEarQuery.setPersonId(pid); // babyPatientExtendEarQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery); - for(BabyPatientExtendEar es : ears){ + for (BabyPatientExtendEar es : ears) { babyIds.add(es.getBabyPatientId()); } @@ -327,7 +327,7 @@ public class EarController extends BaseController { // d、本院：初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); //最后一次听筛时间 - Map data = new HashMap<>(); + Map data = new HashMap<>(); if (screenList == null || screenList.size() == 0) {//没有听筛记录，查询转诊记录 //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); @@ -347,9 +347,9 @@ public class EarController extends BaseController { if (!isResu) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童听筛已通过，不能进行听力诊断"); } - BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size()-1); + BabyPatientExtendEarScreen earScreen = screenList.get(screenList.size() - 1); String screenDate = DateUtil.getyyyy_MM_dd(earScreen.getScreenDate()); - data.put("screenDate",screenDate); + data.put("screenDate", screenDate); } BaseResponse resObj = new BaseResponse(); resObj.setObject(data); @@ -401,7 +401,7 @@ public class EarController extends BaseController { query.setCheckHospitalId(hospitalId); query.setBabyId(babyId); query.setStatus(0); - query.setSort("create_date"); + query.setSort("screen_date"); // d、本院：初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); if (screenList == null && screenList.size() == 0) { @@ -414,10 +414,8 @@ public class EarController extends BaseController { //取复筛记录最后一条结果 BabyPatientExtendEarScreen endScreen = null; for (BabyPatientExtendEarScreen es : screenList) { - if (firstScreen == null) { - if (es.getScreenType() == 1) { - firstScreen = es; - } + if (es.getScreenType() == 1) { + firstScreen = es; } if (es.getScreenType() == 2) { endScreen = es; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 7b4b093..6611dbc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -200,7 +200,7 @@ public class HighriskChangeHospitalController extends BaseController { BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); query.setCheckHospitalId(hospitalId); query.setBabyId(hc.getTargetId()); - query.setSort("create_date"); + query.setSort("screen_date"); // d、本院：初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); //根据医院ID和babyid查询听筛初筛第一条记录和复筛最后一条记录进行并集。前端显示 @@ -210,10 +210,8 @@ public class HighriskChangeHospitalController extends BaseController { //取复筛记录最后一条结果 BabyPatientExtendEarScreen endScreen = null; for (BabyPatientExtendEarScreen es : screenList) { - if (firstScreen == null) { - if (es.getScreenType() == 1) { - firstScreen = es; - } + if (es.getScreenType() == 1) { + firstScreen = es; } if (es.getScreenType() == 2) { endScreen = es; -- 1.8.3.1