diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 62047b0..9e17a29 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -366,15 +366,7 @@ public class AntExChuModel extends BaseModel { private Integer monthCompliance; //妊娠异常 - private Integer pregnancyExcpetion; - - public Integer getPregnancyExcpetion() { - return pregnancyExcpetion; - } - - public void setPregnancyExcpetion(Integer pregnancyExcpetion) { - this.pregnancyExcpetion = pregnancyExcpetion; - } + private String pregnancyExcpetion; public Integer getPregnancyMethod() { return pregnancyMethod; @@ -384,6 +376,14 @@ public class AntExChuModel extends BaseModel { this.pregnancyMethod = pregnancyMethod; } + public String getPregnancyExcpetion() { + return pregnancyExcpetion; + } + + public void setPregnancyExcpetion(String pregnancyExcpetion) { + this.pregnancyExcpetion = pregnancyExcpetion; + } + public Integer getMonthCompliance() { return monthCompliance; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 79e9f3d..469a34f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2128,7 +2128,21 @@ public class ViewFacade { map.put("monthCompliance",data.getMonthCompliance() == null ? "" : data.getMonthCompliance() == 1 ? "是" : "否"); map.put("pregnancyMethod", data.getPregnancyMethod() == null ? "" : PregnancyMethodEnums.getNameById(data.getPregnancyMethod())); - map.put("pregnancyMethod", data.getPregnancyExcpetion() == null ? "" : PregnancyExceptionEnums.getNameById(data.getPregnancyExcpetion())); + + StringBuilder pe = new StringBuilder(); + if (StringUtils.isNotEmpty(data.getPregnancyExcpetion())) + { + String[] arrs = data.getPregnancyExcpetion().split(","); + for (int i = 0 ; i < arrs.length ; i++) + { + pe.append(PregnancyExceptionEnums.getNameById(Integer.valueOf(arrs[i]))); + if (i != arrs.length - 1) + { + pe.append(","); + } + } + } + map.put("PregnancyExcpetion",pe.toString()); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index bf6105f..e065919 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -355,19 +355,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { //妊娠方法 private Integer pregnancyMethod; - //符合月份 1是 2否 + //符合月份 1是 2否 private Integer monthCompliance; //妊娠异常 - private Integer pregnancyExcpetion; - - public Integer getPregnancyExcpetion() { - return pregnancyExcpetion; - } - - public void setPregnancyExcpetion(Integer pregnancyExcpetion) { - this.pregnancyExcpetion = pregnancyExcpetion; - } + private String pregnancyExcpetion; public Integer getPregnancyMethod() { return pregnancyMethod; @@ -385,6 +377,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.monthCompliance = monthCompliance; } + public String getPregnancyExcpetion() { + return pregnancyExcpetion; + } + + public void setPregnancyExcpetion(String pregnancyExcpetion) { + this.pregnancyExcpetion = pregnancyExcpetion; + } + public String getConfigItemId() { return configItemId; }