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 2bb8c2f..4c68b28 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 @@ -105,11 +105,11 @@ public class AntExChuModel extends BaseModel { //丈夫健康情况 private String hHealthInfo; //引产 - private String yinchan; + private Integer yinchan; //宫外孕 - private String gongwaiyun; + private Integer gongwaiyun; //药物流产次数 - private String yaowu; + private Integer yaowu; //自然流产 private Integer abortionZR; //人工流产 @@ -187,27 +187,27 @@ public class AntExChuModel extends BaseModel { return hospitalId; } - public String getYinchan() { + public Integer getYinchan() { return yinchan; } - public void setYinchan(String yinchan) { + public void setYinchan(Integer yinchan) { this.yinchan = yinchan; } - public String getGongwaiyun() { + public Integer getGongwaiyun() { return gongwaiyun; } - public void setGongwaiyun(String gongwaiyun) { + public void setGongwaiyun(Integer gongwaiyun) { this.gongwaiyun = gongwaiyun; } - public String getYaowu() { + public Integer getYaowu() { return yaowu; } - public void setYaowu(String yaowu) { + public void setYaowu(Integer yaowu) { this.yaowu = yaowu; } 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 f4651ac..77ec4fb 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 @@ -281,7 +281,6 @@ public class ViewFacade { /* 基本信息 */ //孕妇基本信息 map.put("id", data.getId()); - map.put("yaowu", data.getYaowu()); map.put("birthDefectTodo", data.getBirthDefectTodo()); map.put("diagnosisOther", data.getDiagnosisOther()); map.put("username", patients.getUsername()); @@ -399,13 +398,22 @@ public class ViewFacade { map.put("yinchan", UnitUtils.unitSplice(data.getYinchan(), UnitConstants.CI)); map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI)); //流产 - String abortion = ""; - abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI); - if (data.getAbortionZR() != null && data.getAbortionRG() != null) { - abortion += "(自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + - data.getAbortionRG() + UnitConstants.CI + ")"; + StringBuffer abortion = new StringBuffer(); + abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI)); + abortion.append("("); + + if (data.getAbortionZR() != null) { + abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI ); + } + + if(data.getAbortionRG() != null){ + abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); } + if(data.getYaowu()!=null){ + abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); + } + abortion.append(")"); map.put("abortion", abortion); 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 269b389..7097a14 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 @@ -192,11 +192,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { //实验结果 private String syjg; //引产 - private String yinchan; + private Integer yinchan; //宫外孕 - private String gongwaiyun; + private Integer gongwaiyun; //药物流产次数 - private String yaowu; + private Integer yaowu; //自然流产 private Integer abortionZR; //人工流产 @@ -255,27 +255,27 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.couponType = couponType; } - public String getYinchan() { + public Integer getYinchan() { return yinchan; } - public void setYinchan(String yinchan) { + public void setYinchan(Integer yinchan) { this.yinchan = yinchan; } - public String getGongwaiyun() { + public Integer getGongwaiyun() { return gongwaiyun; } - public void setGongwaiyun(String gongwaiyun) { + public void setGongwaiyun(Integer gongwaiyun) { this.gongwaiyun = gongwaiyun; } - public String getYaowu() { + public Integer getYaowu() { return yaowu; } - public void setYaowu(String yaowu) { + public void setYaowu(Integer yaowu) { this.yaowu = yaowu; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 7886592..4c07ab4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -80,11 +80,11 @@ public class AntexChuResult { // 顺产 private Integer delivery; //引产 - private String yinchan; + private Integer yinchan; //宫外孕 - private String gongwaiyun; + private Integer gongwaiyun; //药物流产次数 - private String yaowu; + private Integer yaowu; //刨宫产 private Integer planedProd; //流产 @@ -491,27 +491,27 @@ public class AntexChuResult { return gonggao; } - public String getYinchan() { + public Integer getYinchan() { return yinchan; } - public void setYinchan(String yinchan) { + public void setYinchan(Integer yinchan) { this.yinchan = yinchan; } - public String getGongwaiyun() { + public Integer getGongwaiyun() { return gongwaiyun; } - public void setGongwaiyun(String gongwaiyun) { + public void setGongwaiyun(Integer gongwaiyun) { this.gongwaiyun = gongwaiyun; } - public String getYaowu() { + public Integer getYaowu() { return yaowu; } - public void setYaowu(String yaowu) { + public void setYaowu(Integer yaowu) { this.yaowu = yaowu; }