From ade8e02c3495a70b2d2389c459941f99a6bd10ea Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 8 Sep 2016 14:34:16 +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 --- .../java/com/lyms/platform/query/PatientsQuery.java | 5 +++-- .../operate/web/facade/AntenatalExaminationFacade.java | 18 ++++++++++++------ .../operate/web/facade/BookbuildingFacade.java | 8 ++++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 8e27604..d34317a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -530,11 +530,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != hScore) { condition = condition.and("riskScore", hScore, MongoOper.IS); + }else if (null != isHighRisk) { + condition = condition.and("riskScore", 0, MongoOper.GT); } + if (StringUtils.isNotEmpty( rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); - }else if (null != isHighRisk) { - condition = condition.and("riskLevelId", null, MongoOper.NE); } if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 83ac76d..fc8b51f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -74,7 +74,9 @@ public class AntenatalExaminationFacade { //修改孕妇高危等级 Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); - updatePatientRiskLevel(antenatalExamination, patients); +// updatePatientRiskLevel(antenatalExamination, patients); + patientsService.updatePatient(patients); + updateLastRisk(antExAddRequest.getParentId()); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); @@ -93,11 +95,12 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); model.setPid(patients.getPid()); + patientsService.updatePatient(patients); antenatalExaminationService.addOneBabyAnt(model); //修改申请单状态 updateApplyOrder(model, antExAddRequest.getParentId()); //修改孕妇高危等级 - updatePatientRiskLevel(model, patients); +// updatePatientRiskLevel(model, patients); if (null != patients.getBuildType() && patients.getBuildType() == 3) { @@ -1249,10 +1252,13 @@ public class AntenatalExaminationFacade { HighScoreResult highScoreResult= findLastRisk(patients.getPid(),true); patients1.setRiskScore(highScoreResult.getScore()); - patients1.setRiskFactorId(highScoreResult.getHighId()); - patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); - - patientsService.findAndModify(patientsQuery1,patients1); + if(CollectionUtils.isNotEmpty(highScoreResult.getHighId())) { + patients1.setRiskFactorId(highScoreResult.getHighId()); + } + if(CollectionUtils.isNotEmpty(highScoreResult.getLevelId())){ + patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); + } + patientsService.findAndModify(patientsQuery1, patients1); } /** * 根据身份证号或者就诊卡号查询产妇 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 41774e1..3ca0d9c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -204,9 +204,13 @@ public class BookbuildingFacade { { patient.setPid(resperson.getId()); HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(resperson.getId(), true); - patient.setRiskFactorId(highScoreResult.getHighId()); + if(CollectionUtils.isNotEmpty(highScoreResult.getHighId())){ + patient.setRiskFactorId(highScoreResult.getHighId()); + } patient.setRiskScore(highScoreResult.getScore()); - patient.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); + if(CollectionUtils.isNotEmpty(highScoreResult.getLevelId())){ + patient.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); + } } patient.setCreated(new Date()); -- 1.8.3.1