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 67e93a9..d92d3ee 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,7 +1747,7 @@ public class MaternalDeliverModel extends BaseModel { /*******威海再次新增字段(12月计划中)*******/ private Integer gravidity;//孕次 private String department;//科室(1:产一;2:产二) - private List myzd;//母婴阻断 + private Map myzd;//母婴阻断 private String analMode;//镇痛方式(1:无痛;2:无痛+陪娩;3:导乐+陪娩;4:陪娩) private String hyCondition;//会阴情况(1:Ⅰ度;2:Ⅱ度;3:Ⅲ度;4:侧切) private String ssRecord;//手术记录 @@ -1882,11 +1882,11 @@ public class MaternalDeliverModel extends BaseModel { this.department = department; } - public List getMyzd() { + public Map getMyzd() { return myzd; } - public void setMyzd(List myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; } 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 7f0feb9..81f5685 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 Map getMyzd() { return myzd; } - public void setMyzd(List myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; } @@ -297,7 +297,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert myzd;//母婴阻断 + private Map myzd;//母婴阻断 private String analMode;//镇痛方式(1:无痛;2:无痛+陪娩;3:导乐+陪娩;4:陪娩) private String hyCondition;//会阴情况(1:Ⅰ度;2:Ⅱ度;3:Ⅲ度;4:侧切) private String ssRecord;//手术记录 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 ec7c4b2..0649718 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 @@ -128,7 +128,7 @@ public class MaternalDeliverResult { /*******威海再次新增字段(12月计划中)*******/ private Integer gravidity;//孕次 private String department;//科室(1:产一;2:产二) - private List myzd;//母婴阻断 + private Map myzd;//母婴阻断 private String analMode;//镇痛方式(1:无痛;2:无痛+陪娩;3:导乐+陪娩;4:陪娩) private String hyCondition;//会阴情况(1:Ⅰ度;2:Ⅱ度;3:Ⅲ度;4:侧切) private String ssRecord;//手术记录 @@ -159,11 +159,11 @@ public class MaternalDeliverResult { this.department = department; } - public List getMyzd() { + public Map getMyzd() { return myzd; } - public void setMyzd(List myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; }