From a231fd579760d26ed33e765511bd1e85cf4cdcac Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 5 Dec 2016 12:30:46 +0800 Subject: [PATCH] update --- .../operate/web/controller/PremaritalCheckupController.java | 2 +- .../platform/operate/web/facade/PremaritalCheckupFacade.java | 6 +++--- .../operate/web/request/PremaritalCheckupQueryRequest.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java index 9f0bf28..43eebc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java @@ -69,7 +69,7 @@ public class PremaritalCheckupController { param.setId(id); }else { param.setVcCardNo(vcCardNo); - param.setCertificateNum(certificateNum); + param.setVcCardNo(certificateNum); } return premaritalCheckupFacade.getPremaritalCheckup(param); } 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 7469d72..369d1aa 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 @@ -73,10 +73,10 @@ public class PremaritalCheckupFacade { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 - if (StringUtils.isNotEmpty(requestParam.getCertificateNum())) { + if (StringUtils.isNotEmpty(requestParam.getCardNo())) { archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); - archiveQuery.setCertificateNum(requestParam.getCertificateNum()); + archiveQuery.setCertificateNum(requestParam.getCardNo()); List modelList = residentsArchiveService.queryResident(archiveQuery); if (CollectionUtils.isNotEmpty(modelList)) { archiveModel = modelList.get(0); @@ -182,7 +182,7 @@ public class PremaritalCheckupFacade { query.setLimit(request.getLimit()); query.setNeed("y"); query.setYn(YnEnums.YES.getId()); - query.setCertificateNum(request.getCertificateNum()); + query.setCertificateNum(request.getCardNo()); query.setYiXueYiJian(request.getYiXueYiJian()); query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart()); query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java index ff31214..38f8385 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java @@ -11,7 +11,7 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ private String id; //证件号 - private String certificateNum; + private String cardNo; //就诊卡 private String vcCardNo; //妇女姓名 @@ -43,12 +43,12 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ this.id = id; } - public String getCertificateNum() { - return certificateNum; + public String getCardNo() { + return cardNo; } - public void setCertificateNum(String certificateNum) { - this.certificateNum = certificateNum; + public void setCardNo(String cardNo) { + this.cardNo = cardNo; } public String getVcCardNo() { -- 1.8.3.1