From 91b22d3782c87adfab5faa12fce3b2b67f0f486a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 5 Dec 2016 11:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/result/QuanChanResult.java   | 10 ++++++++++
 .../platform/operate/web/worker/QuanChanPatientWorker.java     |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index 9a9c581..6a9a548 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -60,6 +60,16 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     private String fCh;
     //建档时间
     private String bTime;
+    //胎数
+    private String tireNumber;
+
+    public String getTireNumber() {
+        return tireNumber;
+    }
+
+    public void setTireNumber(String tireNumber) {
+        this.tireNumber = tireNumber;
+    }
 
     public String getbTime() {
         return bTime;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index 5478d50..7dd5efb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.worker;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.enums.ServiceStatusEnums;
 import com.lyms.platform.common.enums.ServiceTypeEnums;
+import com.lyms.platform.common.enums.TaiShuEnums;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.facade.PatientFacade;
@@ -106,7 +107,7 @@ public class QuanChanPatientWorker implements Callable<List<QuanChanResult>> {
             List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
             if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
                 chanResult.setDueWeek(maternalDeliverModels.get(0).getDueDate());
-
+                chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
                 try {
                     chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
                 } catch (Exception e) {
-- 
1.8.3.1