From 866bb4f2857ec1f770aba94d5dc3ef0f8a035830 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 11 Dec 2018 10:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/MaternalDeliverModel.java    | 12 ++++++------
 .../platform/operate/web/request/MatDeliverAddRequest.java   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

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 3d8f4e4..67e93a9 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<Object> myzd;//母婴阻断
     private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
     private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
     private String ssRecord;//手术记录
-    private List<Map<String,Object>> ssCount;//手术清点
+    private Map<String,Object> ssCount;//手术清点
     private String ssProcedure;//所施手术
 
     public Integer getParity() {
@@ -1882,11 +1882,11 @@ public class MaternalDeliverModel extends BaseModel {
         this.department = department;
     }
 
-    public List getMyzd() {
+    public List<Object> getMyzd() {
         return myzd;
     }
 
-    public void setMyzd(List myzd) {
+    public void setMyzd(List<Object> myzd) {
         this.myzd = myzd;
     }
 
@@ -1914,11 +1914,11 @@ public class MaternalDeliverModel extends BaseModel {
         this.ssRecord = ssRecord;
     }
 
-    public List<Map<String,Object>> getSsCount() {
+    public Map<String,Object> getSsCount() {
         return ssCount;
     }
 
-    public void setSsCount(List<Map<String,Object>> ssCount) {
+    public void setSsCount(Map<String,Object> 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 088cbc3..7f0feb9 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<MaternalDelive
         this.department = department;
     }
 
-    public List getMyzd() {
+    public List<Object> getMyzd() {
         return myzd;
     }
 
-    public void setMyzd(List myzd) {
+    public void setMyzd(List<Object> myzd) {
         this.myzd = myzd;
     }
 
@@ -261,11 +261,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         this.ssRecord = ssRecord;
     }
 
-    public List<Map<String,Object>> getSsCount() {
+    public Map<String,Object> getSsCount() {
         return ssCount;
     }
 
-    public void setSsCount(List<Map<String,Object>> ssCount) {
+    public void setSsCount(Map<String,Object> ssCount) {
         this.ssCount = ssCount;
     }
 
@@ -297,11 +297,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     /*******威海再次新增字段（12月计划中）*******/
     private Integer gravidity;//孕次
     private String department;//科室(1：产一；2：产二)
-    private List myzd;//母婴阻断
+    private List<Object> myzd;//母婴阻断
     private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
     private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
     private String ssRecord;//手术记录
-    private List<Map<String,Object>> ssCount;//手术清点
+    private Map<String,Object> ssCount;//手术清点
     private String ssProcedure;//所施手术
 
 
-- 
1.8.3.1