From 05299aa557b17747fdd4cf06d757f6b45077575b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Mar 2020 14:54:09 +0800 Subject: [PATCH] update --- .../lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 61d2798..18d0b4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -408,6 +408,7 @@ public class ResidentsArchiveFacade { private synchronized void setCode(ResidentsArchiveModel archiveModel) { + String cuurent = DateUtil.getYyyyMM(new Date()); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setYn(YnEnums.YES.getId()); query.setHospitalId(archiveModel.getHospitalId()); @@ -418,15 +419,13 @@ public class ResidentsArchiveFacade { List modelList = residentsArchiveService.queryResidentWithSort(query,"code",Sort.Direction.DESC); if (CollectionUtils.isNotEmpty(modelList)) { ResidentsArchiveModel model = modelList.get(0); - if (model.getCode() != null) + if (model.getCode() != null && String.valueOf(model.getCode()).contains(cuurent)) { archiveModel.setCode(model.getCode()+1); + return; } } - else - { - archiveModel.setCode(Long.valueOf(DateUtil.getYyyyMM(new Date())+"001")); - } + archiveModel.setCode(Long.valueOf(cuurent+"001")); } } -- 1.8.3.1