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 4ea2664..f4651ac 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,9 +281,6 @@ 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()); @@ -398,6 +395,9 @@ public class ViewFacade { map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(), UnitConstants.CI)); map.put("delivery", UnitUtils.unitSplice(data.getDelivery(), UnitConstants.CI)); map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(), UnitConstants.CI)); + map.put("neoDeathTodo", UnitUtils.unitSplice(data.getNeoDeathTodo(), UnitConstants.CI)); + 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); 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 a1dfdde..7886592 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 @@ -79,6 +79,12 @@ public class AntexChuResult { private Integer prodTime; // 顺产 private Integer delivery; + //引产 + private String yinchan; + //宫外孕 + private String gongwaiyun; + //药物流产次数 + private String yaowu; //刨宫产 private Integer planedProd; //流产 @@ -485,6 +491,30 @@ public class AntexChuResult { return gonggao; } + 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 setGonggao(String gonggao) { this.gonggao = gonggao; } @@ -961,6 +991,9 @@ public class AntexChuResult { if(null!=antExChuModel.getBp()){ setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class)); } + setYaowu(antExChuModel.getYaowu()); + setGongwaiyun(antExChuModel.getGongwaiyun()); + setYinchan(antExChuModel.getYinchan()); setNeoDeathTodo(antExChuModel.getNeoDeathTodo()); setBirthDefectTodo(antExChuModel.getBirthDefectTodo()); setHeart(antExChuModel.getHeart());