diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index c28d851..c04f413 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -148,7 +148,10 @@ public class ResidentsArchiveModel extends BaseModel{ private String hccs;//活产次数 private String zyhc;//足月活产次数 private String zccs;//早产次数 - private String isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) + private Integer isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) + private String stsc;//死胎死产次数 + private String zylc;//自然流产次数 + private String rglc;//人工流产次数 private Integer isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) private String bz;//病种 private String xxqk;//详细情况 @@ -324,14 +327,38 @@ public class ResidentsArchiveModel extends BaseModel{ this.zccs = zccs; } - public String getIsOrNotRsjj() { + public Integer getIsOrNotRsjj() { return isOrNotRsjj; } - public void setIsOrNotRsjj(String isOrNotRsjj) { + public void setIsOrNotRsjj(Integer isOrNotRsjj) { this.isOrNotRsjj = isOrNotRsjj; } + public String getStsc() { + return stsc; + } + + public void setStsc(String stsc) { + this.stsc = stsc; + } + + public String getZylc() { + return zylc; + } + + public void setZylc(String zylc) { + this.zylc = zylc; + } + + public String getRglc() { + return rglc; + } + + public void setRglc(String rglc) { + this.rglc = rglc; + } + public Integer getIsOrNotQxe() { return isOrNotQxe; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index b01566d..e257c5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -610,7 +610,10 @@ public class ResidentsArchiveFacade{ result.setHccs(model.getHccs()); result.setZyhc(model.getZyhc()); result.setZccs(model.getZccs()); - result.setIsOrNotRsjj(model.getIsOrNotRsjj() == null ? null : JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class)); + result.setIsOrNotRsjj(model.getIsOrNotRsjj()); + result.setStsc(model.getStsc()); + result.setZylc(model.getZylc()); + result.setRglc(model.getRglc()); result.setIsOrNotQxe(model.getIsOrNotQxe()); result.setBz(model.getBz()); result.setXxqk(model.getXxqk()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index 4021531..6aec2ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -136,7 +136,10 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert