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 38002ce..d506886 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 @@ -256,6 +256,10 @@ public class PremaritalCheckup extends BaseModel { private String fuGaoYou; //精索静脉曲张 private Integer jingMai; + //部位 + private String position; + //程度 + private String degree; //精索静脉曲张(左) private String jingMaiZuo; //精索静脉曲张(右) @@ -365,7 +369,7 @@ public class PremaritalCheckup extends BaseModel { //家庭史 private Map familyHistory; //智力(1:异常 2:正常) - private Integer intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) @@ -430,11 +434,11 @@ public class PremaritalCheckup extends BaseModel { this.pfmf = pfmf; } - public Integer getIntelligence() { + public Map getIntelligence() { return intelligence; } - public void setIntelligence(Integer intelligence) { + public void setIntelligence(Map intelligence) { this.intelligence = intelligence; } @@ -1390,6 +1394,22 @@ public class PremaritalCheckup extends BaseModel { this.jingMai = jingMai; } + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDegree() { + return degree; + } + + public void setDegree(String degree) { + this.degree = degree; + } + public String getJingMaiZuo() { return jingMaiZuo; } 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 45120ea..197a8ee 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 @@ -394,6 +394,8 @@ public class PremaritalCheckupFacade { checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails()); checkupResult.setVolumeLeft(result.getVolumeLeft()); checkupResult.setVolumeRight(result.getVolumeRight()); + checkupResult.setPosition(result.getPosition()); + checkupResult.setDegree(result.getDegree()); return checkupResult; } @@ -585,6 +587,11 @@ public class PremaritalCheckupFacade { checkup.setVolumeLeft(addRequest.getVolumeLeft()); //双侧扪及右体积 checkup.setVolumeRight(addRequest.getVolumeRight()); + //部位 + checkup.setPosition(addRequest.getPosition()); + //程度 + checkup.setDegree(addRequest.getDegree()); + /* 婚育史 */ 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 72b4a88..ae8497c 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 @@ -110,7 +110,7 @@ public class PremaritalCheckupAddRequest { //语言能力异常详情 private String yuYanNengLiDetails; //智力(1:异常 2:正常) - private Integer intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) @@ -289,6 +289,10 @@ public class PremaritalCheckupAddRequest { private String fuGaoYou; //精索静脉曲张 private Integer jingMai; + //部位 + private String position; + //程度 + private String degree; //精索静脉曲张(左) private String jingMaiZuo; //精索静脉曲张(右) @@ -430,11 +434,11 @@ public class PremaritalCheckupAddRequest { this.familyHistory = familyHistory; } - public Integer getIntelligence() { + public Map getIntelligence() { return intelligence; } - public void setIntelligence(Integer intelligence) { + public void setIntelligence(Map intelligence) { this.intelligence = intelligence; } @@ -1344,6 +1348,22 @@ public class PremaritalCheckupAddRequest { this.jingMai = jingMai; } + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDegree() { + return degree; + } + + public void setDegree(String degree) { + this.degree = degree; + } + public String getJingMaiZuo() { return jingMaiZuo; } 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 c586f5a..9093fa0 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 @@ -350,7 +350,7 @@ public class PremaritalCheckupResult { //家庭史 private Map familyHistory; //智力(1:异常 2:正常) - private Integer intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) @@ -369,7 +369,26 @@ public class PremaritalCheckupResult { private String volumeLeft; //体积右 private String volumeRight; + //部位 + private String position; + //程度 + private String degree; + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getDegree() { + return degree; + } + + public void setDegree(String degree) { + this.degree = degree; + } public String getGanDetails() { return ganDetails; @@ -467,11 +486,11 @@ public class PremaritalCheckupResult { this.liuchan = liuchan; } - public Integer getIntelligence() { + public Map getIntelligence() { return intelligence; } - public void setIntelligence(Integer intelligence) { + public void setIntelligence(Map intelligence) { this.intelligence = intelligence; }