From 87708e057e202b1f1f3b453646ee7553d94c72fb Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 24 Dec 2020 17:16:29 +0800 Subject: [PATCH] update --- .../web/facade/PremaritalCheckupFacade.java | 6 +++ .../web/result/PremaritalCheckupPageResult.java | 52 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) 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 a075495..294c536 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 @@ -1700,6 +1700,12 @@ public class PremaritalCheckupFacade { //返回婚检信息 public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) { PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult(); + checkupResult.setBaseSign(result.getBaseSign()); + checkupResult.setPhysiqueSign(result.getPhysiqueSign()); + checkupResult.setRepSign(result.getRepSign()); + checkupResult.setGuidSign(result.getGuidSign()); + checkupResult.setUserSign(result.getUserSign()); + checkupResult.setUsername(archiveModel.getUsername()); checkupResult.setSex(getBaseicConfigByid(archiveModel.getSex())); checkupResult.setBirthday(DateUtil.getyyyy_MM_dd(archiveModel.getBirthday())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java index 5f5cb20..7d2f54f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java @@ -9,8 +9,20 @@ import java.util.Map; public class PremaritalCheckupPageResult { + //婚检信息签名 + private String baseSign; + //体格检查签名 + private String physiqueSign; + //生殖检查签名 + private String repSign; + + //婚前指导签名 + private String guidSign; + + //用户签名 + private String userSign; // private String id; // //女性/男性ID // private String parentId; @@ -946,6 +958,14 @@ public class PremaritalCheckupPageResult { return shiLi; } + public String getUserSign() { + return userSign; + } + + public void setUserSign(String userSign) { + this.userSign = userSign; + } + public void setShiLi(String shiLi) { this.shiLi = shiLi; } @@ -1050,6 +1070,38 @@ public class PremaritalCheckupPageResult { return tiTai; } + public String getBaseSign() { + return baseSign; + } + + public void setBaseSign(String baseSign) { + this.baseSign = baseSign; + } + + public String getPhysiqueSign() { + return physiqueSign; + } + + public void setPhysiqueSign(String physiqueSign) { + this.physiqueSign = physiqueSign; + } + + public String getRepSign() { + return repSign; + } + + public void setRepSign(String repSign) { + this.repSign = repSign; + } + + public String getGuidSign() { + return guidSign; + } + + public void setGuidSign(String guidSign) { + this.guidSign = guidSign; + } + public void setTiTai(String tiTai) { this.tiTai = tiTai; } -- 1.8.3.1