diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 4bbfc7d..9dc4d6f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -1363,6 +1363,34 @@ public class MaternalDeliverModel extends BaseModel { private Integer twining ;//缠绕 private String tightness;//松紧程度 + private String placentalComplete;//胎盘完整性(0,:完整;1:基本完整;2:不完整) + private String placentalQs;//胎盘缺损g + private String ccm;//粗糙面 + + public String getPlacentalComplete() { + return placentalComplete; + } + + public void setPlacentalComplete(String placentalComplete) { + this.placentalComplete = placentalComplete; + } + + public String getPlacentalQs() { + return placentalQs; + } + + public void setPlacentalQs(String placentalQs) { + this.placentalQs = placentalQs; + } + + public String getCcm() { + return ccm; + } + + public void setCcm(String ccm) { + this.ccm = ccm; + } + public String getTightness() { return tightness; } @@ -1760,37 +1788,14 @@ public class MaternalDeliverModel extends BaseModel { private String bedNum;//床号 private String bhNum;//住院号 - private String placentalComplete;//胎盘完整性(0,:完整;1:基本完整;2:不完整) + /*private String placentalComplete;//胎盘完整性(0,:完整;1:基本完整;2:不完整) private String placentalQs;//胎盘缺损g - private String ccm;//粗糙面 + private String ccm;//粗糙面*/ private String fhqk;//缝合情况(1:皮内缝合;2:外缝针) private String szxz;//水肿血肿 private String jmkz;//静脉扩张 private String zyDiagnosis;//主要诊断 - public String getPlacentalComplete() { - return placentalComplete; - } - - public void setPlacentalComplete(String placentalComplete) { - this.placentalComplete = placentalComplete; - } - - public String getPlacentalQs() { - return placentalQs; - } - - public void setPlacentalQs(String placentalQs) { - this.placentalQs = placentalQs; - } - - public String getCcm() { - return ccm; - } - - public void setCcm(String ccm) { - this.ccm = ccm; - } public String getFhqk() { return fhqk; 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 9b49c55..64ae528 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 @@ -2781,9 +2781,6 @@ public class ViewFacade { map.put("gjOther",data.getGjOther()); map.put("bedNum",data.getBedNum()); map.put("bhNum",data.getBhNum()); - map.put("placentalComplete",data.getPlacentalComplete()); - map.put("placentalQs",data.getPlacentalQs()); - map.put("ccm",data.getCcm()); map.put("fhqk",data.getFhqk()); map.put("szxz",data.getSzxz()); map.put("jmkz",data.getJmkz()); @@ -2929,6 +2926,9 @@ public class ViewFacade { extMap.put("qdfz",temp.getQdfz()); extMap.put("twining",temp.getTwining()); extMap.put("tightness",temp.getTightness()); + extMap.put("placentalComplete",temp.getPlacentalComplete()); + extMap.put("placentalQs",temp.getPlacentalQs()); + extMap.put("ccm",temp.getCcm()); /****************************/ ExtPlacentaList.add(extMap); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index c712bb9..ec18487 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -342,9 +342,9 @@ public class MatDeliverAddRequest implements IBasicRequestConvert