Commit 9e2dda7dc504b8b50aa20b03e2c76e019da16ac6
1 parent
47ebf1c531
Exists in
master
and in
8 other branches
update 婚前检查
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
9e2dda7
| ... | ... | @@ -245,7 +245,7 @@ |
| 245 | 245 | //就诊卡不为空 |
| 246 | 246 | archiveQuery.setVcCardNo(addRequest.getVcCardNo()); |
| 247 | 247 | } |
| 248 | - List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResidentWithSort(archiveQuery, "created", Sort.Direction.DESC); | |
| 248 | + List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); | |
| 249 | 249 | if (CollectionUtils.isNotEmpty(modelList)){ |
| 250 | 250 | ResidentsArchiveModel archiveModel = modelList.get(0); |
| 251 | 251 | id = addOrUpdate(addRequest,userId,archiveModel); |
| ... | ... | @@ -265,7 +265,7 @@ |
| 265 | 265 | PremaritalCheckup checkup = new PremaritalCheckup(); |
| 266 | 266 | |
| 267 | 267 | /* 配偶信息 */ |
| 268 | - if (addRequest.getDeliverStatus()==1){ | |
| 268 | + if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){ | |
| 269 | 269 | checkup.setSpouseName(addRequest.getSpouseName()); |
| 270 | 270 | checkup.setSpouseCertificateTypeId(addRequest.getSpouseCertificateTypeId()); |
| 271 | 271 | checkup.setSpouseCertificateNum(addRequest.getSpouseCertificateNum()); |