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 a692d25..31e40b6 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 @@ -22,6 +22,10 @@ public class PremaritalCheckup extends BaseModel { private String id; //女性/男性ID private String parentId; + // 1妇科检查,男性检查拒绝,2不拒绝 + private String jczt; + //加上绝经 1否 2 是 + private String fkjjState; //婚检时间 private Date premaritalUpTime; //医院ID @@ -1520,6 +1524,22 @@ public class PremaritalCheckup extends BaseModel { return yinDao; } + public String getJczt() { + return jczt; + } + + public void setJczt(String jczt) { + this.jczt = jczt; + } + + public String getFkjjState() { + return fkjjState; + } + + public void setFkjjState(String fkjjState) { + this.fkjjState = fkjjState; + } + public void setYinDao(String yinDao) { this.yinDao = yinDao; } 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 ec6d9df..6d0c91e 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 @@ -471,7 +471,8 @@ public class PremaritalCheckupFacade { checkupResult.setRepSign(result.getRepSign()); checkupResult.setGuidSign(result.getGuidSign()); checkupResult.setUserSign(result.getUserSign()); - + checkupResult.setJczt(result.getJczt()); + checkupResult.setFkjjState(result.getFkjjState()); return checkupResult; } @@ -653,6 +654,9 @@ public class PremaritalCheckupFacade { } checkup.setDeliverStatus(addRequest.getDeliverStatus()); } + checkup.setJczt(addRequest.getJczt()); + checkup.setFkjjState(addRequest.getFkjjState()); + //血缘关系 checkup.setIsBloodshed(addRequest.getIsBloodshed()); //血缘详情 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 c17b0f8..97c2fbe 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 @@ -13,6 +13,11 @@ import java.util.Map; @Form public class PremaritalCheckupAddRequest { + // 1妇科检查,男性检查拒绝,2不拒绝 + private String jczt; + //加上绝经 1否 2 是 + private String fkjjState; + private String id; //女性/男性ID private String parentId; @@ -1951,6 +1956,22 @@ public class PremaritalCheckupAddRequest { return volumeLeft; } + public String getJczt() { + return jczt; + } + + public void setJczt(String jczt) { + this.jczt = jczt; + } + + public String getFkjjState() { + return fkjjState; + } + + public void setFkjjState(String fkjjState) { + this.fkjjState = fkjjState; + } + public void setVolumeLeft(String volumeLeft) { this.volumeLeft = volumeLeft; } 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 c09aba6..d667217 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 @@ -420,6 +420,26 @@ public class PremaritalCheckupResult { //用户签名 private String userSign; + // 1妇科检查,男性检查拒绝,2不拒绝 + private String jczt; + //加上绝经 1否 2 是 + private String fkjjState; + + public String getJczt() { + return jczt; + } + + public void setJczt(String jczt) { + this.jczt = jczt; + } + + public String getFkjjState() { + return fkjjState; + } + + public void setFkjjState(String fkjjState) { + this.fkjjState = fkjjState; + } public String getBaseSign() { return baseSign;