From c6bda7d74f5c5ecaaead067fc5ed5938a96f0d08 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 1 Mar 2018 17:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=95=B0=E6=8D=AE=E4=B8=AA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9B=B4=E6=96=B0bug=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=BD=AE=E8=87=AA=E6=B5=8Bbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 33 ++++++++++++++++++----
 .../operate/web/facade/TrackDownFacade.java        |  4 +--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index a9d9aa6..7c12cf4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -96,7 +96,8 @@ public class MatDeliverFacade {
 
     @Autowired
     private OperateLogFacade operateLogFacade;
-
+    @Autowired
+    private TrackDownRecordService trackDownRecordService;
     @Autowired
     private PatientServiceFacade patientServiceFacade;
     @Autowired
@@ -280,12 +281,10 @@ public class MatDeliverFacade {
             //新增分娩信息
             matDeliverService.addMatDeliver(maternalDeliverModel);
 
+
             //添加产后追访信息
             if (CollectionUtils.isNotEmpty(patients)) {
-                TrackDownRecord trackDownRecord =  maternalDeliverModel.build(patients.get(0));
-                trackDownRecord.setHospitalId(maternalDeliverModel.getHospitalId());
-                trackDownRecord.setSource(maternalDeliverModel.getId());
-                trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
+                addTrackDownInfo(userId,maternalDeliverModel,patients.get(0));
             }
 
             operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, OptActionEnums.ADD.getId(), "添加分娩");
@@ -391,6 +390,30 @@ public class MatDeliverFacade {
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
+
+    /**
+     * 添加或更新追访信息
+     * @param userId
+     * @param patient
+     * @param patient
+     */
+    public void addTrackDownInfo(Integer userId, MaternalDeliverModel deliverModel, Patients patient) {
+        //添加产后追访信息
+        TrackDownRecord trackDownRecord =  deliverModel.build(patient);
+        trackDownRecord.setHospitalId(deliverModel.getHospitalId());
+        trackDownRecord.setSource(deliverModel.getId());
+
+        //根据patient查询是否存在追访信息
+        TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
+        downRecordQuery.setParentId(patient.getId());
+        List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
+        if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
+            TrackDownRecord trackDownRecord1 = records.get(0);
+            trackDownRecord.setId(trackDownRecord1.getId());
+        }
+        trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
+    }
+
     /**
      * 修改建档记录的分娩时间和
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
index add87a2..3f654c2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
@@ -110,7 +110,7 @@ public class TrackDownFacade {
         downRecordQuery.setCityId(downQueryRequest.getCityId());
         downRecordQuery.setStreetId(downQueryRequest.getStreetId());
         downRecordQuery.setKey(downQueryRequest.getKey());
-        //如果是产筛请求
+        //产检和产后数据特殊处理
         if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
             downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
             downRecordQuery.setTrackTypes(Arrays.asList(3, 8));
@@ -119,7 +119,7 @@ public class TrackDownFacade {
         } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()) {
             downRecordQuery.setTrackTypes(Arrays.asList(6, 11));
         } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()) {
-            downRecordQuery.setTrackTypes(Arrays.asList(7, 10));
+            downRecordQuery.setTrackTypes(Arrays.asList(6, 10));
         } else {
             downRecordQuery.setTrackType(downQueryRequest.getTrackType());
         }
-- 
1.8.3.1