From 3fa7e3b806b85405f41119f16a5b93700ae986fe Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 25 Aug 2022 11:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/PatientRegistrationModelQuery.java | 2 +- .../web/facade/PatientRegistrationFacade.java | 25 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java index ecdc4a4..e364167 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java @@ -51,7 +51,7 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert condition = condition.and("name", name, MongoOper.IS); } - if (outType == null) { + if (outType != null) { condition = condition.and("outType", outType, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java index 21bc6cd..16f8fb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java @@ -98,9 +98,26 @@ public class PatientRegistrationFacade extends BaseServiceImpl { model.setPhone(personModels.getPhone()); } - model.setCreateDate(new Date()); - model.setHospitalId("216"); - model = patientRegistrationService.add(model); + PatientRegistrationModelQuery query = new PatientRegistrationModelQuery(); + query.setCardno(model.getCardno()); + query.setOutType(1); + List patientRegistrationModels = patientRegistrationService.queryListAll(query); + if (CollectionUtils.isNotEmpty(patientRegistrationModels)) + { + PatientRegistrationModel db = patientRegistrationModels.get(0); + db.setOrderDate(model.getOrderDate()); + db.setBedType(model.getBedType()); + db.setCreateDate(new Date()); + db.setPhone(model.getPhone()); + db.setName(model.getName()); + patientRegistrationService.update(db, db.getId()); + } + else + { + model.setCreateDate(new Date()); + model.setHospitalId("216"); + model = patientRegistrationService.add(model); + } createMsg(model); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -140,7 +157,7 @@ public class PatientRegistrationFacade extends BaseServiceImpl { messages.add(mr); if (CollectionUtils.isNotEmpty(messages)) { System.out.println(messages.get(0).toString()); - //smsConfigFacade.saveMsg(messages, messages.get(0).getHospitalId()); + // smsConfigFacade.saveMsg(messages, messages.get(0).getHospitalId()); } } -- 1.8.3.1