From 0766cb531cc24dc65185a10d98ae0de022a82c34 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 9 Aug 2016 09:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/common/enums/RenShenJieJu1Enums.java  | 40 ++++++++++++++++++++++
 .../com/lyms/platform/common/enums/SieveEnums.java |  2 +-
 .../operate/web/controller/SieveController.java    |  7 ++--
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJu1Enums.java

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJu1Enums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJu1Enums.java
new file mode 100644
index 0000000..7709a91
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJu1Enums.java
@@ -0,0 +1,40 @@
+package com.lyms.platform.common.enums;
+
+/**
+ * Created by Administrator on 2016/6/24 0024.
+ */
+public enum RenShenJieJu1Enums {
+    O("继续妊娠", 0),O1("终止妊娠", 1);
+
+    private RenShenJieJu1Enums(String name, Integer id) {
+        this.name = name;
+        this.id = id;
+    }
+
+    private String name;
+    private Integer id;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public static String getTitle(Integer id){
+        for(RenShenJieJu1Enums enums:values()){
+            if(id==enums.getId()){
+                return enums.getName();
+            }
+        }
+        return null;
+    }
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
index 7acb449..0152deb 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
@@ -14,7 +14,7 @@ public enum  SieveEnums {
         this.name=name;
     }
     public  enum NotifyEnums{
-        O("未通知",0),O1("已通知",1);
+        O("待产筛",0),O1("产筛未完成",1),O2("产筛已完成",2),O3("产诊未完成",3),O4("产诊已完成",4);
         private NotifyEnums(String name,Integer id){
             this.name=name;
             this.id=id;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
index a98a189..e564bca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
@@ -4,10 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
-import com.lyms.platform.common.enums.ChanQResultEnums;
-import com.lyms.platform.common.enums.FuZhongEnums;
-import com.lyms.platform.common.enums.RenShenJieJuEnums;
-import com.lyms.platform.common.enums.SieveEnums;
+import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.facade.SieveFacade;
@@ -148,7 +145,7 @@ public class SieveController extends BaseController {
     //妊娠结局
     public List<Object> getRenShenJieJuEnums() {
         List<Object> list = new ArrayList<>();
-        for (RenShenJieJuEnums enums : RenShenJieJuEnums.values()) {
+        for (RenShenJieJu1Enums enums : RenShenJieJu1Enums.values()) {
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("id", enums.getId());
             resultMap.put("name", enums.getName());
-- 
1.8.3.1