From e1a76f3c46faaaa9a0128bba3436b0e58949a371 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 22 Aug 2016 10:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/biz/service/PatientsService.java    |  4 +++-
 .../main/java/com/lyms/platform/pojo/SieveModel.java  | 19 +++++++++++++++----
 .../platform/operate/web/facade/ApplyOrderFacade.java |  2 +-
 .../platform/operate/web/result/SieveListResult.java  |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 038c377..58ec3cd 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -213,7 +213,8 @@ public class PatientsService {
                         sieveModel.setPhone(patients.getPhone());
                         sieveModel.setName(patients.getUsername());
                         sieveModel.setLastMenses(patients.getLastMenses());
-                        sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
+                        sieveModel.setCardNo(patients.getCardNo());
+                        sieveModel.setDueWeek(days);
                         sieveDao.updateChanQianSieve(sieveModel);
                     }
                 }
@@ -244,6 +245,7 @@ public class PatientsService {
         sieveModel.setHospitalId(patients.getHospitalId());
         sieveModel.setName(patients.getUsername());
         sieveModel.setPhone(patients.getPhone());
+        sieveModel.setCardNo(patients.getCardNo());
         sieveModel.setStatus(SieveStatusEnums.O.getId());
         sieveModel.setCqStatus(0);
         sieveModel.setYn(YnEnums.YES.getId());
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
index 270a2c2..f196cc0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
@@ -26,10 +26,12 @@ public class SieveModel extends BaseModel {
     private Integer tireNumber;
     //整体风险
     private Integer ztfx;
+    private String cardNo;
+
     //联系方式
     private String phone;
-    //申请孕周
-    private String dueWeek;
+    //申请孕周(怀孕的天数)
+    private int dueWeek;
     //产前诊断 1 已检查 0 未检查
     private Integer cqStatus;
     //产前诊断结果
@@ -52,6 +54,15 @@ public class SieveModel extends BaseModel {
     private Date modified;
     private Integer yn;
 
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
     public String getFrom() {
         return from;
     }
@@ -132,11 +143,11 @@ public class SieveModel extends BaseModel {
         this.diaUnit = diaUnit;
     }
 
-    public String getDueWeek() {
+    public int getDueWeek() {
         return dueWeek;
     }
 
-    public void setDueWeek(String dueWeek) {
+    public void setDueWeek(int dueWeek) {
         this.dueWeek = dueWeek;
     }
 
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 3ce56c3..6eb465d 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
@@ -246,7 +246,7 @@ public class ApplyOrderFacade {
                 SieveModel sieveModel = sieveModels.get(0);
                 sieveModel.setStatus(2);
                 int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
-                sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
+                sieveModel.setDueWeek(days);
                 sieveService.updateOneChanQianDiaSieve(sieveModel);
             }
         }
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 d5440f6..f75d58d 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
@@ -179,7 +179,7 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
         if(null!=destModel.getTireNumber()){
             setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
         }
-        setDueWeek(destModel.getDueWeek());
+        setDueWeek(StringUtils.dueWeek(destModel.getDueWeek()));
         if(null!=destModel.getZtfx()) {
             setZtfx(destModel.getZtfx()+"");
             setZtfxText(SieveEnums.getTitle(destModel.getZtfx()));
-- 
1.8.3.1