From e8b134c6fce1511e6403ebada3596be95026877e Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 11 Dec 2018 10:27:39 +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

---
 .../platform/operate/web/result/MaternalDeliverResult.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 f0887f4..ec7c4b2 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,11 +128,11 @@ public class MaternalDeliverResult  {
     /*******威海再次新增字段（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 String getSsProcedure() {
@@ -159,11 +159,11 @@ public class MaternalDeliverResult  {
         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;
     }
 
@@ -191,11 +191,11 @@ public class MaternalDeliverResult  {
         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;
     }
 
-- 
1.8.3.1