diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 4ad523b..f80c5d5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -393,6 +393,65 @@ public class PremaritalCheckup extends BaseModel { //体积右 private String volumeRight; + // 邮编 + private String mailNo; + // 视力左右 + private String shiliLeft; + private String shiliRight; + + // 听力 左右 + private String tingliLeft; + private String tingliRight; + // 语言 + private String yuyan; + + public String getMailNo() { + return mailNo; + } + + public void setMailNo(String mailNo) { + this.mailNo = mailNo; + } + + public String getShiliLeft() { + return shiliLeft; + } + + public void setShiliLeft(String shiliLeft) { + this.shiliLeft = shiliLeft; + } + + public String getShiliRight() { + return shiliRight; + } + + public void setShiliRight(String shiliRight) { + this.shiliRight = shiliRight; + } + + public String getTingliLeft() { + return tingliLeft; + } + + public void setTingliLeft(String tingliLeft) { + this.tingliLeft = tingliLeft; + } + + public String getTingliRight() { + return tingliRight; + } + + public void setTingliRight(String tingliRight) { + this.tingliRight = tingliRight; + } + + public String getYuyan() { + return yuyan; + } + + public void setYuyan(String yuyan) { + this.yuyan = yuyan; + } public String getVolumeLeft() { return volumeLeft; 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 5fd11cc..f693a6e 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 @@ -439,6 +439,14 @@ public class PremaritalCheckupFacade { checkupResult.setHunqianHealth(result.getHunqianHealth()); checkupResult.setGuidanceResults(result.getGuidanceResults()); + + checkupResult.setMailNo(result.getMailNo()); + checkupResult.setShiliRight(result.getShiliRight()); + checkupResult.setShiliLeft(result.getShiliLeft()); + checkupResult.setTingliLeft(result.getTingliLeft()); + checkupResult.setTingliRight(result.getTingliRight()); + checkupResult.setYuyan(result.getYuyan()); + return checkupResult; } @@ -851,6 +859,14 @@ public class PremaritalCheckupFacade { checkup.setZhiDaoYiJian(addRequest.getZhiDaoYiJian()); checkup.setHunJianDoctor(addRequest.getHunJianDoctor()); + checkup.setMailNo(addRequest.getMailNo()); + checkup.setShiliRight(addRequest.getShiliRight()); + checkup.setShiliLeft(addRequest.getShiliLeft()); + checkup.setTingliLeft(addRequest.getTingliLeft()); + checkup.setTingliRight(addRequest.getTingliRight()); + checkup.setYuyan(addRequest.getYuyan()); + + /* 基础数据 */ checkup.setYn(YnEnums.YES.getId()); checkup.setModified(new Date()); @@ -2128,6 +2144,13 @@ public class PremaritalCheckupFacade { checkupResult.setGaoWanYou(result.getGaoWanYou());//睾丸右 checkupResult.setSpouseCertificateTypeId(result.getSpouseCertificateTypeId());//证件类型 + checkupResult.setMailNo(result.getMailNo()); + checkupResult.setShiliRight(result.getShiliRight()); + checkupResult.setShiliLeft(result.getShiliLeft()); + checkupResult.setTingliLeft(result.getTingliLeft()); + checkupResult.setTingliRight(result.getTingliRight()); + checkupResult.setYuyan(result.getYuyan()); + return checkupResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index f125613..a085d4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -402,6 +402,66 @@ public class PremaritalCheckupAddRequest { private Integer sexType; + // 邮编 + private String mailNo; + // 视力左右 + private String shiliLeft; + private String shiliRight; + + // 听力 左右 + private String tingliLeft; + private String tingliRight; + // 语言 + private String yuyan; + + public String getMailNo() { + return mailNo; + } + + public void setMailNo(String mailNo) { + this.mailNo = mailNo; + } + + public String getShiliLeft() { + return shiliLeft; + } + + public void setShiliLeft(String shiliLeft) { + this.shiliLeft = shiliLeft; + } + + public String getShiliRight() { + return shiliRight; + } + + public void setShiliRight(String shiliRight) { + this.shiliRight = shiliRight; + } + + public String getTingliLeft() { + return tingliLeft; + } + + public void setTingliLeft(String tingliLeft) { + this.tingliLeft = tingliLeft; + } + + public String getTingliRight() { + return tingliRight; + } + + public void setTingliRight(String tingliRight) { + this.tingliRight = tingliRight; + } + + public String getYuyan() { + return yuyan; + } + + public void setYuyan(String yuyan) { + this.yuyan = yuyan; + } + public Map getMaritalBingHistory() { return maritalBingHistory; } 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 ff8146c..649b02e 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 @@ -373,6 +373,66 @@ public class PremaritalCheckupPageResult { //证件类型 private String spouseCertificateTypeId; + // 邮编 + private String mailNo; + // 视力左右 + private String shiliLeft; + private String shiliRight; + + // 听力 左右 + private String tingliLeft; + private String tingliRight; + // 语言 + private String yuyan; + + public String getMailNo() { + return mailNo; + } + + public void setMailNo(String mailNo) { + this.mailNo = mailNo; + } + + public String getShiliLeft() { + return shiliLeft; + } + + public void setShiliLeft(String shiliLeft) { + this.shiliLeft = shiliLeft; + } + + public String getShiliRight() { + return shiliRight; + } + + public void setShiliRight(String shiliRight) { + this.shiliRight = shiliRight; + } + + public String getTingliLeft() { + return tingliLeft; + } + + public void setTingliLeft(String tingliLeft) { + this.tingliLeft = tingliLeft; + } + + public String getTingliRight() { + return tingliRight; + } + + public void setTingliRight(String tingliRight) { + this.tingliRight = tingliRight; + } + + public String getYuyan() { + return yuyan; + } + + public void setYuyan(String yuyan) { + this.yuyan = yuyan; + } + public String getSpouseCertificateTypeId() { return spouseCertificateTypeId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 24e77ed..43cea54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -378,6 +378,66 @@ public class PremaritalCheckupResult { //程度 private String degree; + // 邮编 + private String mailNo; + // 视力左右 + private String shiliLeft; + private String shiliRight; + + // 听力 左右 + private String tingliLeft; + private String tingliRight; + // 语言 + private String yuyan; + + public String getMailNo() { + return mailNo; + } + + public void setMailNo(String mailNo) { + this.mailNo = mailNo; + } + + public String getShiliLeft() { + return shiliLeft; + } + + public void setShiliLeft(String shiliLeft) { + this.shiliLeft = shiliLeft; + } + + public String getShiliRight() { + return shiliRight; + } + + public void setShiliRight(String shiliRight) { + this.shiliRight = shiliRight; + } + + public String getTingliLeft() { + return tingliLeft; + } + + public void setTingliLeft(String tingliLeft) { + this.tingliLeft = tingliLeft; + } + + public String getTingliRight() { + return tingliRight; + } + + public void setTingliRight(String tingliRight) { + this.tingliRight = tingliRight; + } + + public String getYuyan() { + return yuyan; + } + + public void setYuyan(String yuyan) { + this.yuyan = yuyan; + } + public String getPosition() { return position; }