From e7178089287f3f36fae46671bb95004b3e9fae84 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 19 Nov 2019 15:01:37 +0800
Subject: [PATCH] update

---
 .../lyms/platform/pojo/AmniocentesisInfoModel.java | 52 ++++++++++++---
 .../platform/query/AmniocentesisInfoQuery.java     |  8 +++
 .../operate/web/facade/AmniocentesisFacade.java    |  6 ++
 .../web/request/AmniocentesisInfoRequest.java      | 59 ++++++++++++++---
 .../operate/web/result/AmniocentesisInfo.java      | 50 ++++++++++++++-
 .../operate/web/result/AmniocentesisInfoView.java  | 73 +++++++++++++++++++++-
 6 files changed, 226 insertions(+), 22 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisInfoModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisInfoModel.java
index c7c0d52..0f35d72 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisInfoModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisInfoModel.java
@@ -60,9 +60,18 @@ public class AmniocentesisInfoModel extends BaseModel {
     //末次月经
     private Date lastMenses;
 
-    //月经周期
-    private String mensesCycle;
 
+    // 月经周期开始天数
+    private String mensStartDay;
+
+    // 月经周期开始天数
+    private String mensEndDay;
+
+    // 月经停留开始天数
+    private String mensStopStartDay;
+
+    // 月经停留开始天数
+    private String mensStopEndDay;
     //体重
     private String weight;
 
@@ -120,6 +129,38 @@ public class AmniocentesisInfoModel extends BaseModel {
     private String resultId;
     private String recordId;
 
+    public String getMensStartDay() {
+        return mensStartDay;
+    }
+
+    public void setMensStartDay(String mensStartDay) {
+        this.mensStartDay = mensStartDay;
+    }
+
+    public String getMensEndDay() {
+        return mensEndDay;
+    }
+
+    public void setMensEndDay(String mensEndDay) {
+        this.mensEndDay = mensEndDay;
+    }
+
+    public String getMensStopStartDay() {
+        return mensStopStartDay;
+    }
+
+    public void setMensStopStartDay(String mensStopStartDay) {
+        this.mensStopStartDay = mensStopStartDay;
+    }
+
+    public String getMensStopEndDay() {
+        return mensStopEndDay;
+    }
+
+    public void setMensStopEndDay(String mensStopEndDay) {
+        this.mensStopEndDay = mensStopEndDay;
+    }
+
     public String getResultId() {
         return resultId;
     }
@@ -176,13 +217,6 @@ public class AmniocentesisInfoModel extends BaseModel {
         this.amnioCount = amnioCount;
     }
 
-    public String getMensesCycle() {
-        return mensesCycle;
-    }
-
-    public void setMensesCycle(String mensesCycle) {
-        this.mensesCycle = mensesCycle;
-    }
 
     public String getPatientId() {
         return patientId;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AmniocentesisInfoQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AmniocentesisInfoQuery.java
index 16e93cf..4994ce3 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AmniocentesisInfoQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AmniocentesisInfoQuery.java
@@ -200,6 +200,14 @@ public class AmniocentesisInfoQuery extends BaseQuery implements IConvertToNativ
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
 
+        if (null != cardNo) {
+            condition = condition.and("cardNo", cardNo, MongoOper.IS);
+        }
+
+        if (null != vcCardNo) {
+            condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
+        }
+
         if (StringUtils.isNotEmpty(provinceId)) {
             condition = condition.and("provinceId", provinceId, MongoOper.IS);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
index 8297c91..34160c2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
@@ -115,6 +115,12 @@ public class AmniocentesisFacade {
             data.put("lastMenses",DateUtil.getyyyy_MM_dd(pat.getLastMenses()));
             Date dueDate = DateUtil.addDay(DateUtil.addMonth(pat.getLastMenses(), 9), 7);
             data.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate));
+
+            data.put("mensStartDay",pat.getMensStartDay());
+            data.put("mensEndDay",pat.getMensEndDay());
+            data.put("mensStopStartDay",pat.getMensStopStartDay());
+            data.put("mensStopEndDay",pat.getMensStopEndDay());
+
             data.put("week",DateUtil.getWeekDesc(pat.getLastMenses(),new Date()));
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AmniocentesisInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AmniocentesisInfoRequest.java
index a621df9..86fca02 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AmniocentesisInfoRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AmniocentesisInfoRequest.java
@@ -57,8 +57,18 @@ public class AmniocentesisInfoRequest implements IBasicRequestConvert<Amniocente
     //末次月经
     private String lastMenses;
 
-    //月经周期
-    private String mensesCycle;
+    // 月经周期开始天数
+    private String mensStartDay;
+
+    // 月经周期开始天数
+    private String mensEndDay;
+
+    // 月经停留开始天数
+    private String mensStopStartDay;
+
+    // 月经停留开始天数
+    private String mensStopEndDay;
+
 
     //体重
     private String weight;
@@ -242,13 +252,6 @@ public class AmniocentesisInfoRequest implements IBasicRequestConvert<Amniocente
         this.lastMenses = lastMenses;
     }
 
-    public String getMensesCycle() {
-        return mensesCycle;
-    }
-
-    public void setMensesCycle(String mensesCycle) {
-        this.mensesCycle = mensesCycle;
-    }
 
     public String getWeight() {
         return weight;
@@ -346,6 +349,38 @@ public class AmniocentesisInfoRequest implements IBasicRequestConvert<Amniocente
         this.hospitalId = hospitalId;
     }
 
+    public String getMensStartDay() {
+        return mensStartDay;
+    }
+
+    public void setMensStartDay(String mensStartDay) {
+        this.mensStartDay = mensStartDay;
+    }
+
+    public String getMensEndDay() {
+        return mensEndDay;
+    }
+
+    public void setMensEndDay(String mensEndDay) {
+        this.mensEndDay = mensEndDay;
+    }
+
+    public String getMensStopStartDay() {
+        return mensStopStartDay;
+    }
+
+    public void setMensStopStartDay(String mensStopStartDay) {
+        this.mensStopStartDay = mensStopStartDay;
+    }
+
+    public String getMensStopEndDay() {
+        return mensStopEndDay;
+    }
+
+    public void setMensStopEndDay(String mensStopEndDay) {
+        this.mensStopEndDay = mensStopEndDay;
+    }
+
     @Override
     public AmniocentesisInfoModel convertToDataModel() {
         AmniocentesisInfoModel model = new AmniocentesisInfoModel();
@@ -368,7 +403,11 @@ public class AmniocentesisInfoRequest implements IBasicRequestConvert<Amniocente
         model.setProdTime(getProdTime());
         model.setLastMenses(DateUtil.parseYMD(getLastMenses()));
         model.setWeight(getWeight());
-        model.setMensesCycle(getMensesCycle());
+        model.setMensStartDay(getMensStartDay());
+        model.setMensEndDay(getMensEndDay());
+        model.setMensStopStartDay(getMensStopStartDay());
+        model.setMensStopEndDay(getMensStopEndDay());
+
         model.setSituation(getSituation());
         model.setPoisonous(getPoisonous());
         model.setFamilyHistory(getFamilyHistory());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfo.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfo.java
index 1fcf155..76edffe 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfo.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfo.java
@@ -98,6 +98,18 @@ public class AmniocentesisInfo implements IBasicResultConvert<AmniocentesisInfo,
     //创建机构
     private String hospitalId;
 
+    // 月经周期开始天数
+    private String mensStartDay;
+
+    // 月经周期开始天数
+    private String mensEndDay;
+
+    // 月经停留开始天数
+    private String mensStopStartDay;
+
+    // 月经停留开始天数
+    private String mensStopEndDay;
+
 
     @Override
     public AmniocentesisInfo convertToResult(AmniocentesisInfoModel destModel) {
@@ -121,7 +133,6 @@ public class AmniocentesisInfo implements IBasicResultConvert<AmniocentesisInfo,
         setProdTime(destModel.getProdTime());
         setLastMenses(DateUtil.getyyyy_MM_dd(destModel.getLastMenses()));
         setWeight(destModel.getWeight());
-        setMensesCycle(destModel.getMensesCycle());
 
         setSituation(destModel.getSituation());
         setPoisonous(destModel.getPoisonous());
@@ -135,9 +146,46 @@ public class AmniocentesisInfo implements IBasicResultConvert<AmniocentesisInfo,
         setChip(destModel.getChip());
         setUserId(destModel.getUserId());
         setHospitalId(destModel.getHospitalId());
+        setMensStartDay(destModel.getMensStartDay());
+        setMensEndDay(destModel.getMensEndDay());
+        setMensStopStartDay(destModel.getMensStopStartDay());
+        setMensStopEndDay(destModel.getMensStopEndDay());
+
         return this;
     }
 
+    public String getMensStartDay() {
+        return mensStartDay;
+    }
+
+    public void setMensStartDay(String mensStartDay) {
+        this.mensStartDay = mensStartDay;
+    }
+
+    public String getMensEndDay() {
+        return mensEndDay;
+    }
+
+    public void setMensEndDay(String mensEndDay) {
+        this.mensEndDay = mensEndDay;
+    }
+
+    public String getMensStopStartDay() {
+        return mensStopStartDay;
+    }
+
+    public void setMensStopStartDay(String mensStopStartDay) {
+        this.mensStopStartDay = mensStopStartDay;
+    }
+
+    public String getMensStopEndDay() {
+        return mensStopEndDay;
+    }
+
+    public void setMensStopEndDay(String mensStopEndDay) {
+        this.mensStopEndDay = mensStopEndDay;
+    }
+
     public String getMensesCycle() {
         return mensesCycle;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
index 42da820..c836d78 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
@@ -4,6 +4,8 @@ import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.pojo.AmniocentesisInfoModel;
 
+import java.util.Date;
+
 
 /**
  * Created by Administrator on 2019-10-14.
@@ -92,6 +94,23 @@ public class AmniocentesisInfoView implements IBasicResultConvert<AmniocentesisI
     private String hospitalName;
 
 
+    //孕周
+    private String week;
+
+
+    // 月经周期开始天数
+    private String mensStartDay;
+
+    // 月经周期开始天数
+    private String mensEndDay;
+
+    // 月经停留开始天数
+    private String mensStopStartDay;
+
+    // 月经停留开始天数
+    private String mensStopEndDay;
+
+
     @Override
     public AmniocentesisInfoView convertToResult(AmniocentesisInfoModel destModel) {
         setPatientId(destModel.getPatientId());
@@ -111,16 +130,66 @@ public class AmniocentesisInfoView implements IBasicResultConvert<AmniocentesisI
         setSituation(destModel.getSituation());
         setPoisonous(destModel.getPoisonous());
         setFamilyHistory(destModel.getFamilyHistory());
-        setTangDanger("0".equals(destModel.getTangDanger()) ? "低" : "1".equals(destModel.getTangDanger()) ? "中" : "高");
+        setTangDanger(destModel.getTangDanger() == null ? "" : "0".equals(destModel.getTangDanger()) ? "低" : "1".equals(destModel.getTangDanger()) ? "中" : "高");
         setReferralHospital(destModel.getReferralHospital());
         setOperation(destModel.getOperation());
 
         setOrderDate(DateUtil.getyyyy_MM_dd(destModel.getOrderDate()));
         setApplyDate(DateUtil.getyyyy_MM_dd(destModel.getApplyDate()));
-        setChip("0".equals(destModel.getChip()) ? "无" : "有");
+        setChip(destModel.getChip() == null ? "" : "0".equals(destModel.getChip()) ? "无" : "有");
+        setWeek(DateUtil.getWeekDesc(destModel.getLastMenses(), new Date()));
+
+        setMensStartDay(destModel.getMensStartDay());
+
+        setMensEndDay(destModel.getMensEndDay());
+
+        setMensStopStartDay(destModel.getMensStopStartDay());
+
+        setMensStopEndDay(destModel.getMensStopEndDay());
         return this;
     }
 
+
+    public String getMensStartDay() {
+        return mensStartDay;
+    }
+
+    public void setMensStartDay(String mensStartDay) {
+        this.mensStartDay = mensStartDay;
+    }
+
+    public String getMensEndDay() {
+        return mensEndDay;
+    }
+
+    public void setMensEndDay(String mensEndDay) {
+        this.mensEndDay = mensEndDay;
+    }
+
+    public String getMensStopStartDay() {
+        return mensStopStartDay;
+    }
+
+    public void setMensStopStartDay(String mensStopStartDay) {
+        this.mensStopStartDay = mensStopStartDay;
+    }
+
+    public String getMensStopEndDay() {
+        return mensStopEndDay;
+    }
+
+    public void setMensStopEndDay(String mensStopEndDay) {
+        this.mensStopEndDay = mensStopEndDay;
+    }
+
+    public String getWeek() {
+        return week;
+    }
+
+    public void setWeek(String week) {
+        this.week = week;
+    }
+
     public String getPatientId() {
         return patientId;
     }
-- 
1.8.3.1