From 70a9432ce4d588f455da959cbc90915f9e921200 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 4 Jun 2018 14:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=97=E4=BD=99=E4=B8=8B=E6=AC=A1=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=97=B6=E9=97=B4=E5=88=B0patient=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 093d640..2a57876 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -342,7 +342,7 @@ public class AntenatalExaminationFacade {
                     e.printStackTrace();
                 }
                 try {
-                    //修改孕妇高危等级
+                    //修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
                     updateLastRisk(antExamModel.getParentId());
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -482,7 +482,6 @@ public class AntenatalExaminationFacade {
         antExChuModel.setHospitalId(hospitalId);
         if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
             antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
-
             antenatalExaminationService.updatePatientAbortion(antExChuModel.getId(), antExChuModel.getAbortionZR(), antExChuModel.getAbortionRG());
             commonThreadPool.execute(new Runnable() {
                 @Override
@@ -495,12 +494,10 @@ public class AntenatalExaminationFacade {
                     }
                     patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId());
                     patientsService.updatePatient(patients);
-
-                    //修改本系统最后的高危
+                    //修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
                     updateLastRisk(patients.getId());
                     //修改本院最后一次定义高危
                     updateLastRhTime(patients.getId(), hospitalId);
-
                     setLashCTimes(excAddRequest.getParentId());
                     //冗余到产检表
                     antenatalExaminationService.updateAntExRecord(excAddRequest.getId(), 1);
@@ -524,7 +521,6 @@ public class AntenatalExaminationFacade {
                 PatientsQuery patientsQuery = new PatientsQuery();
                 patientsQuery.setPid(patients.getPid());
                 patientsQuery.setYn(YnEnums.YES.getId());
-
                 antExChuModel.setHospitalId(hospitalId);
                 AntExChuQuery antExChuQuery = new AntExChuQuery();
                 antExChuQuery.setYn(YnEnums.YES.getId());
@@ -553,19 +549,12 @@ public class AntenatalExaminationFacade {
                 commonThreadPool.execute(new Runnable() {
                     @Override
                     public void run() {
-                        //查询最后一次产检筛查结果冗余到patient表
-                        Map<String, Object> map = getPatLastScreenResult(patients.getId());
-                        if (map != null && map.containsKey("screenResult")) {
-                            patients.setScreenResult((List<String>) map.get("screenResult"));
-                        }
                         patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
                         patientsService.updatePatient(patients);
-
                         /** 把优惠券设置为已使用状态 */
                         couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, chuId);
                         //修改患者风险等级
                         patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId());
-
                         updateLastRisk(patients.getId());
                         //修改本院最后一次定义高危
                         updateLastRhTime(patients.getId(), hospitalId);
@@ -932,6 +921,10 @@ public class AntenatalExaminationFacade {
                     break;
                 }
                 highScoreResult.put("screenResult", model.getScreenResult());
+                if(model.getNextCheckTime()!=null){
+                    //最后一次预约下次产检时间
+                    highScoreResult.put("nextCheckTime", model.getNextCheckTime());
+                }
                 next = false;
             }
         }
@@ -951,6 +944,10 @@ public class AntenatalExaminationFacade {
                             break;
                         }
                         highScoreResult.put("screenResult", antExChuModel.getScreenResult());
+                        //最后一次预约下次产检时间
+                        if(antExChuModel.getNextCheckTime()!=null) {
+                            highScoreResult.put("nextCheckTime", antExChuModel.getNextCheckTime());
+                        }
                         next = false;
                     }
                 }
@@ -2025,7 +2022,7 @@ public class AntenatalExaminationFacade {
     }
 
     /**
-     * 修改的时候设置最新的高危
+     * 修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
      *
      * @param parentId
      */
@@ -2053,6 +2050,9 @@ public class AntenatalExaminationFacade {
         if (map != null && map.containsKey("screenResult")) {
             patients1.setScreenResult((List<String>) map.get("screenResult"));
         }
+        if (map != null && map.containsKey("nextCheckTime")) {
+            patients1.setNextCheckTime((Date) map.get("nextCheckTime"));
+        }
         patientsService.findAndModify(patientsQuery1, patients1);
     }
 
-- 
1.8.3.1