Commit 05299aa557b17747fdd4cf06d757f6b45077575b
1 parent
5f3e97f6b4
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 4 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
05299aa
| ... | ... | @@ -408,6 +408,7 @@ |
| 408 | 408 | |
| 409 | 409 | private synchronized void setCode(ResidentsArchiveModel archiveModel) |
| 410 | 410 | { |
| 411 | + String cuurent = DateUtil.getYyyyMM(new Date()); | |
| 411 | 412 | ResidentsArchiveQuery query = new ResidentsArchiveQuery(); |
| 412 | 413 | query.setYn(YnEnums.YES.getId()); |
| 413 | 414 | query.setHospitalId(archiveModel.getHospitalId()); |
| 414 | 415 | |
| 415 | 416 | |
| ... | ... | @@ -418,15 +419,13 @@ |
| 418 | 419 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResidentWithSort(query,"code",Sort.Direction.DESC); |
| 419 | 420 | if (CollectionUtils.isNotEmpty(modelList)) { |
| 420 | 421 | ResidentsArchiveModel model = modelList.get(0); |
| 421 | - if (model.getCode() != null) | |
| 422 | + if (model.getCode() != null && String.valueOf(model.getCode()).contains(cuurent)) | |
| 422 | 423 | { |
| 423 | 424 | archiveModel.setCode(model.getCode()+1); |
| 425 | + return; | |
| 424 | 426 | } |
| 425 | 427 | } |
| 426 | - else | |
| 427 | - { | |
| 428 | - archiveModel.setCode(Long.valueOf(DateUtil.getYyyyMM(new Date())+"001")); | |
| 429 | - } | |
| 428 | + archiveModel.setCode(Long.valueOf(cuurent+"001")); | |
| 430 | 429 | } |
| 431 | 430 | |
| 432 | 431 | } |