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 6f7d67f..3d8f4e4 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 @@ -1747,11 +1747,11 @@ public class MaternalDeliverModel extends BaseModel { /*******威海再次新增字段（12月计划中）*******/ private Integer gravidity;//孕次 private String department;//科室(1：产一；2：产二) - private List myzd;//母婴阻断 + private List myzd;//母婴阻断 private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） private String ssRecord;//手术记录 - private List ssCount;//手术清点 + private List> ssCount;//手术清点 private String ssProcedure;//所施手术 public Integer getParity() { @@ -1882,11 +1882,11 @@ public class MaternalDeliverModel extends BaseModel { this.department = department; } - public List getMyzd() { + public List getMyzd() { return myzd; } - public void setMyzd(List myzd) { + public void setMyzd(List myzd) { this.myzd = myzd; } @@ -1914,11 +1914,11 @@ public class MaternalDeliverModel extends BaseModel { this.ssRecord = ssRecord; } - public List getSsCount() { + public List> getSsCount() { return ssCount; } - public void setSsCount(List ssCount) { + public void setSsCount(List> ssCount) { this.ssCount = ssCount; } 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 d4c0746..088cbc3 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 @@ -229,11 +229,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert getMyzd() { + public List getMyzd() { return myzd; } - public void setMyzd(List myzd) { + public void setMyzd(List myzd) { this.myzd = myzd; } @@ -261,11 +261,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert getSsCount() { + public List> getSsCount() { return ssCount; } - public void setSsCount(List ssCount) { + public void setSsCount(List> ssCount) { this.ssCount = ssCount; } @@ -297,11 +297,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert myzd;//母婴阻断 + private List myzd;//母婴阻断 private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） private String ssRecord;//手术记录 - private List ssCount;//手术清点 + private List> ssCount;//手术清点 private String ssProcedure;//所施手术 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index 1dc243b..f0887f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -125,6 +125,80 @@ public class MaternalDeliverResult { private String sszcjg;//手术助产经过 private String remarks;//备注 + /*******威海再次新增字段（12月计划中）*******/ + private Integer gravidity;//孕次 + private String department;//科室(1：产一；2：产二) + private List myzd;//母婴阻断 + private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） + private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） + private String ssRecord;//手术记录 + private List> ssCount;//手术清点 + private String ssProcedure;//所施手术 + + public String getSsProcedure() { + return ssProcedure; + } + + public void setSsProcedure(String ssProcedure) { + this.ssProcedure = ssProcedure; + } + + public Integer getGravidity() { + return gravidity; + } + + public void setGravidity(Integer gravidity) { + this.gravidity = gravidity; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public List getMyzd() { + return myzd; + } + + public void setMyzd(List myzd) { + this.myzd = myzd; + } + + public String getAnalMode() { + return analMode; + } + + public void setAnalMode(String analMode) { + this.analMode = analMode; + } + + public String getHyCondition() { + return hyCondition; + } + + public void setHyCondition(String hyCondition) { + this.hyCondition = hyCondition; + } + + public String getSsRecord() { + return ssRecord; + } + + public void setSsRecord(String ssRecord) { + this.ssRecord = ssRecord; + } + + public List> getSsCount() { + return ssCount; + } + + public void setSsCount(List> ssCount) { + this.ssCount = ssCount; + } + public Integer getParity() { return parity; } @@ -288,6 +362,14 @@ public class MaternalDeliverResult { setSszcjg(destModel.getSszcjg()); setRemarks(destModel.getRemarks()); + setGravidity(destModel.getGravidity()); + setDepartment(destModel.getDepartment()); + setMyzd(destModel.getMyzd()); + setAnalMode(destModel.getAnalMode()); + setSsRecord(destModel.getSsRecord()); + setSsCount(destModel.getSsCount()); + setSsProcedure(destModel.getSsProcedure()); + return this; } @@ -494,6 +576,8 @@ public class MaternalDeliverResult { private String stReflex;//手头反射 private String sAbility;//吮能力 /*************新增结束************/ + private String umbilicus;//脐 + private String umXqFy;//脐带血清反应 public Baby(){}//增加无参构造方法 public Baby(MaternalDeliverModel.Baby babyModel){ @@ -595,6 +679,25 @@ public class MaternalDeliverResult { setStReflex(babyModel.getStReflex()); setsAbility(babyModel.getsAbility()); + setUmbilicus(babyModel.getUmbilicus()); + setUmXqFy(babyModel.getUmXqFy()); + + } + + public String getUmXqFy() { + return umXqFy; + } + + public void setUmXqFy(String umXqFy) { + this.umXqFy = umXqFy; + } + + public String getUmbilicus() { + return umbilicus; + } + + public void setUmbilicus(String umbilicus) { + this.umbilicus = umbilicus; } public String getNbnaNum() {