From e2c36b0679abc0caa08c9d056788bb39b45bceab Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 29 Jul 2016 16:27:21 +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

---
 .../com/lyms/platform/operate/web/controller/EnumsController.java    | 2 +-
 .../java/com/lyms/platform/operate/web/result/SieveListResult.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
index 2a6962c..b1e385b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
@@ -183,7 +183,7 @@ public class EnumsController {
     @ResponseBody
     public List getTaiPan(){
         List<Object> list = new ArrayList<>();
-        for(TaiPanEnums enums:TaiPanEnums.values()){
+        for(TaiShuEnums.TaiPanEnums enums:TaiShuEnums.TaiPanEnums.values()){
             Map<String,Object> resultMap = new HashMap<>();
             resultMap.put("id",enums.getId());
             resultMap.put("name",enums.getName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
index 82905df..6ba7004 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
@@ -4,9 +4,8 @@ import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.enums.ChanQResultEnums;
 import com.lyms.platform.common.enums.RenShenJieJuEnums;
 import com.lyms.platform.common.enums.SieveEnums;
-import com.lyms.platform.common.enums.TaiPanEnums;
+import com.lyms.platform.common.enums.TaiShuEnums;
 import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.SieveModel;
 
 import java.util.Date;
@@ -160,7 +159,7 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
             this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
         }
         if(null!=destModel.getTireNumber()){
-            setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + ""));
+            setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
         }
         setDueWeek(destModel.getDueWeek());
         if(null!=destModel.getZtfx()) {
-- 
1.8.3.1