From ae0d05114145551b91a496a756b25f1bf6c67919 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 13 Sep 2016 16:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 71 ++++++++++++++-------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 0cb34e7..93f0d70 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -387,18 +387,7 @@ public class PatientFacade { quanPatientsResult.setlName(patients.getBookbuildingDoctor()); } } - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - quanPatientsResult.setCheckDoctor(users.getName()); - } else { - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } else { - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } + antExQuery.setHospitalId(null); //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); @@ -424,10 +413,36 @@ public class PatientFacade { List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(examinationModels)) { nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime()); + + if (StringUtils.isNotEmpty(examinationModels.get(0).getCheckDoctor())) { + if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor())); + if (null != users) { + quanPatientsResult.setCheckDoctor(users.getName()); + } else { + quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + } + } else { + quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + } + } + } else { List list = antExService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list)) { nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); + if (StringUtils.isNotEmpty(list.get(0).getProdDoctor())) { + if (NumberUtils.isNumber(list.get(0).getProdDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor())); + if (null != users) { + quanPatientsResult.setCheckDoctor(users.getName()); + } else { + quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + } + } else { + quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + } + } } } HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); @@ -464,18 +479,8 @@ public class PatientFacade { riskPatientsResult.setlName(patients.getBookbuildingDoctor()); } } - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - riskPatientsResult.setCheckDoctor(users.getName()); - } else { - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } else { - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } + + antExQuery.setPid(patients.getPid()); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(null); @@ -496,15 +501,33 @@ public class PatientFacade { riskPatientsResult.setcTimes(i + b); riskPatientsResult.setcHTimes(chi+chb); String nextCheckTime = ""; + List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(examinationModels)) { + if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor())); + if (null != users) { + riskPatientsResult.setCheckDoctor(users.getName()); + } else { + riskPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + } + } nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime()); } else { List list = antExService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list)) { nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); + if (NumberUtils.isNumber(list.get(0).getProdDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor())); + if (null != users) { + riskPatientsResult.setCheckDoctor(users.getName()); + } else { + riskPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + } + } } } + riskPatientsResult.setcTime(nextCheckTime); riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); -- 1.8.3.1