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 86943ac..2bb8c2f 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 @@ -104,7 +104,12 @@ public class AntExChuModel extends BaseModel { private String bp; //丈夫健康情况 private String hHealthInfo; - + //引产 + private String yinchan; + //宫外孕 + private String gongwaiyun; + //药物流产次数 + private String yaowu; //自然流产 private Integer abortionZR; //人工流产 @@ -182,6 +187,30 @@ public class AntExChuModel extends BaseModel { return hospitalId; } + public String getYinchan() { + return yinchan; + } + + public void setYinchan(String yinchan) { + this.yinchan = yinchan; + } + + public String getGongwaiyun() { + return gongwaiyun; + } + + public void setGongwaiyun(String gongwaiyun) { + this.gongwaiyun = gongwaiyun; + } + + public String getYaowu() { + return yaowu; + } + + public void setYaowu(String yaowu) { + this.yaowu = yaowu; + } + public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } 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 c3a383f..4ea2664 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 @@ -282,6 +282,9 @@ public class ViewFacade { //孕妇基本信息 map.put("id", data.getId()); map.put("neoDeathTodo", data.getNeoDeathTodo()); + map.put("yinchan", data.getYinchan()); + map.put("gongwaiyun", data.getGongwaiyun()); + map.put("yaowu", data.getYaowu()); map.put("birthDefectTodo", data.getBirthDefectTodo()); map.put("diagnosisOther", data.getDiagnosisOther()); map.put("username", patients.getUsername()); 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 787480e..269b389 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 @@ -191,7 +191,12 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String ydqjd; //实验结果 private String syjg; - + //引产 + private String yinchan; + //宫外孕 + private String gongwaiyun; + //药物流产次数 + private String yaowu; //自然流产 private Integer abortionZR; //人工流产 @@ -250,6 +255,29 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.couponType = couponType; } + public String getYinchan() { + return yinchan; + } + + public void setYinchan(String yinchan) { + this.yinchan = yinchan; + } + + public String getGongwaiyun() { + return gongwaiyun; + } + + public void setGongwaiyun(String gongwaiyun) { + this.gongwaiyun = gongwaiyun; + } + + public String getYaowu() { + return yaowu; + } + + public void setYaowu(String yaowu) { + this.yaowu = yaowu; + } public String getBarCode() { return barCode; @@ -947,6 +975,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel=new AntExChuModel(); + antExChuModel.setYinchan(yinchan); + antExChuModel.setGongwaiyun(gongwaiyun); + antExChuModel.setYaowu(yaowu); antExChuModel.setNeoDeathTodo(neoDeathTodo); antExChuModel.setBirthDefectTodo(birthDefectTodo); antExChuModel.setDiagnosisOther(diagnosisOther);