From f7b43148baeec176510a4b78c2b23dca9e28603a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 8 Jul 2016 09:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ApplyOrderFacade.java       |   3 +-
 .../operate/web/result/AntexListResult.java        |   2 +-
 .../operate/web/result/SieveApplyOrderResult.java  | 119 ++++++++++++++++++++-
 3 files changed, 119 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index f1f2439..310728e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -118,7 +118,8 @@ public class ApplyOrderFacade {
         SieveApplyOrderModel sieveApplyOrderModel = null;
         if (CollectionUtils.isNotEmpty(list)) {
             sieveApplyOrderModel = list.get(0);
-            sieveApplyOrderResult.convertToResult(sieveApplyOrderModel);
+            Patients patients  =patientsService.findOnePatientById(sieveApplyOrderModel.getParentId());
+            sieveApplyOrderResult.convertToResult(sieveApplyOrderModel,patients);
         }
         return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 1ccdd3c..0b499c5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -126,7 +126,7 @@ public class AntexListResult  {
         }
         setName(patients.getUsername());
         setPhone(patients.getPhone());
-        setRemarks("产妇备注");
+        setRemarks(patients.getMremark());
         setRiskScore("60");
 
         int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
index 5e48a32..f14888c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
@@ -1,17 +1,41 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.base.IBasicResultConvert;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.SieveApplyOrderModel;
 import org.apache.commons.lang.StringUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * Created by Administrator on 2016/7/7 0007.
  */
-public class SieveApplyOrderResult  implements IBasicResultConvert<SieveApplyOrderResult, SieveApplyOrderModel> {
+public class SieveApplyOrderResult  {
+
+    //名字
+    private String name;
+    //年龄
+    private Integer age;
+    //孕周
+    private String dueWeek;
+    //预产期
+    private String yChanQi;
+    //手机号
+    private String phone;
+    //高危因素
+    private List riskFactor;
+    //高危评分
+    private String riskScore;
+    //备注
+    private String remarks;
+    //末次月经
+    private String lastMenses;
+
+
+
     private String id;
     //患者id
     private String parentId;
@@ -72,8 +96,7 @@ public class SieveApplyOrderResult  implements IBasicResultConvert<SieveApplyOrd
         this.parentId = parentId;
     }
 
-    @Override
-    public SieveApplyOrderResult convertToResult(SieveApplyOrderModel destModel) {
+    public SieveApplyOrderResult convertToResult(SieveApplyOrderModel destModel,Patients patients) {
         setId(destModel.getId());
         setParentId(destModel.getParentId());
         setApplyDoctor(destModel.getApplyDoctor());
@@ -82,6 +105,96 @@ public class SieveApplyOrderResult  implements IBasicResultConvert<SieveApplyOrd
         if(StringUtils.isNotEmpty(destModel.getCheckItem())){
             setCheckItem(JsonUtil.toList(destModel.getCheckItem(),List.class));
         }
+        try {
+            if(null!=patients.getBirth()){
+                setAge(DateUtil.getAge(patients.getBirth()));
+            }
+        }catch (Exception e){
+        }
+        setName(patients.getUsername());
+        setPhone(patients.getPhone());
+        setRemarks(patients.getMremark());
+        setRiskScore("60");
+
+        int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
+        String week= (days/7)+"";
+        int day = (days%7);
+        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        if(null!=patients.getLastMenses()){
+            setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
+        }
         return this;
     }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public String getDueWeek() {
+        return dueWeek;
+    }
+
+    public void setDueWeek(String dueWeek) {
+        this.dueWeek = dueWeek;
+    }
+
+    public String getLastMenses() {
+        return lastMenses;
+    }
+
+    public void setLastMenses(String lastMenses) {
+        this.lastMenses = lastMenses;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public List getRiskFactor() {
+        return riskFactor;
+    }
+
+    public void setRiskFactor(List riskFactor) {
+        this.riskFactor = riskFactor;
+    }
+
+    public String getRiskScore() {
+        return riskScore;
+    }
+
+    public void setRiskScore(String riskScore) {
+        this.riskScore = riskScore;
+    }
+
+    public String getyChanQi() {
+        return yChanQi;
+    }
+
+    public void setyChanQi(String yChanQi) {
+        this.yChanQi = yChanQi;
+    }
 }
-- 
1.8.3.1