From dab140f7f2d1c8136a11729ab064cd999b1bc76f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 23 Apr 2020 13:07:32 +0800
Subject: [PATCH] update

---
 .../lyms/platform/biz/service/PatientsService.java | 16 +++++++++-
 .../operate/web/facade/PostReviewFacade.java       | 34 ++++++++++++++--------
 .../web/request/PostReviewQueryRequest.java        | 12 ++++++++
 3 files changed, 49 insertions(+), 13 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 cafaac0..d11986d 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
@@ -445,12 +445,26 @@ public class PatientsService {
      * 自动分娩产妇的
      */
     public void autoMatDeliver() {
+        setAutoMatDeliver(null);
 
+    }
+
+
+    public void setAutoMatDeliver(String cardNo)
+    {
         Date endDate = DateUtil.addDay(new Date(), -294);
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setType(1);
-        patientsQuery.setLastMensesNeEnd(endDate);
+        if (StringUtils.isNotEmpty(cardNo))
+        {
+            patientsQuery.setCardNo(cardNo);
+        }
+        else
+        {
+            patientsQuery.setLastMensesNeEnd(endDate);
+        }
+
         List<Patients> patientses = queryPatient(patientsQuery);
         List<PersonModel> list = null;
         for (Patients patients : patientses) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
index 578fa9d..f2f23cc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
@@ -352,7 +352,14 @@ public class PostReviewFacade {
 
         //未分娩建档
         if (null != patients) {
-            return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查");
+            if (postReviewQueryRequest.getFlag() != null)
+            {
+                patientsService.setAutoMatDeliver(patients.getCardNo());
+            }
+            else
+            {
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查");
+            }
         }
 
         //取所有医院的建档数据  优先取本院 ，然后取外院
@@ -363,14 +370,17 @@ public class PostReviewFacade {
                 return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠，不能进行复查");
             }
 
-//            MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
-//            matDeliverQuery.setPid(patientsList.getPid());
-//            matDeliverQuery.setYn(YnEnums.YES.getId());
-//            List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
-//            if (CollectionUtils.isEmpty(list)) {
-//                return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
-//            }
-
+            List<MaternalDeliverModel> list = null;
+            if (postReviewQueryRequest.getFlag() == null)
+            {
+                MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
+                matDeliverQuery.setPid(patientsList.getPid());
+                matDeliverQuery.setYn(YnEnums.YES.getId());
+                list = matDeliverService.query(matDeliverQuery);
+                if (CollectionUtils.isEmpty(list)) {
+                    return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
+                }
+            }
 
             PostReviewQuery postReviewQuery = new PostReviewQuery();
             postReviewQuery.setPid(patientsList.getPid());
@@ -383,9 +393,9 @@ public class PostReviewFacade {
             if (patientsList.getType() == 3){
                 dueDate = DateUtil.getyyyy_MM_dd(patientsList.getFmDate());
             }
-//            else {
-//                dueDate = list.get(0).getDueDate();
-//            }
+            else if (postReviewQueryRequest.getFlag() == null && CollectionUtils.isNotEmpty(list)) {
+                dueDate = list.get(0).getDueDate();
+            }
             HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(), false);
 
             List<AntData> dataList = new ArrayList<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java
index fe1e6eb..85efb7b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java
@@ -24,6 +24,18 @@ public class PostReviewQueryRequest {
 
     private String patientId;
 
+
+    //空的时候表示 不只直接填写产后复查，不为空直接填写产后复查
+    private Integer flag;
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
     public String getPatientId() {
         return patientId;
     }
-- 
1.8.3.1