From 9e2dda7dc504b8b50aa20b03e2c76e019da16ac6 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Tue, 6 Dec 2016 11:48:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A9=9A=E5=89=8D=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index bf50cb3..23b06aa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -245,7 +245,7 @@ public class PremaritalCheckupFacade { //就诊卡不为空 archiveQuery.setVcCardNo(addRequest.getVcCardNo()); } - List modelList = residentsArchiveService.queryResidentWithSort(archiveQuery, "created", Sort.Direction.DESC); + List modelList = residentsArchiveService.queryResident(archiveQuery); if (CollectionUtils.isNotEmpty(modelList)){ ResidentsArchiveModel archiveModel = modelList.get(0); id = addOrUpdate(addRequest,userId,archiveModel); @@ -265,7 +265,7 @@ public class PremaritalCheckupFacade { PremaritalCheckup checkup = new PremaritalCheckup(); /* 配偶信息 */ - if (addRequest.getDeliverStatus()==1){ + if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){ checkup.setSpouseName(addRequest.getSpouseName()); checkup.setSpouseCertificateTypeId(addRequest.getSpouseCertificateTypeId()); checkup.setSpouseCertificateNum(addRequest.getSpouseCertificateNum()); -- 1.8.3.1