From 905308d3465012b8450b755614927447c291283b Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 9 Mar 2018 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E5=A4=8D=E6=9F=A5=E4=B8=AD?=
 =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=96=B9=E5=BC=8F=E5=BA=94=E8=AF=A5=E6=98=AF?=
 =?UTF-8?q?--=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=98=AF=E9=A1=BA=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/TrackDownFacade.java        | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

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 c0479e7..7e1fc65 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
@@ -14,6 +14,7 @@ import com.lyms.platform.common.utils.SystemConfig;
 import com.lyms.platform.operate.web.request.TrackDownQueryRequest;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.MatDeliverQuery;
 import com.lyms.platform.query.PostReviewQuery;
 import com.lyms.platform.query.TrackDownRecordQuery;
 import org.apache.commons.collections.CollectionUtils;
@@ -93,6 +94,9 @@ public class TrackDownFacade {
     @Autowired
     private PostReviewService postReviewService;
 
+    @Autowired
+    private MatDeliverService matDeliverService;
+
 
     @PostConstruct
     private void init() {
@@ -331,9 +335,28 @@ public class TrackDownFacade {
             postReviewQuery.setParentId(downRecord.getParentId());
 
             Patients patients = patientsService.findOnePatientById(downRecord.getParentId());
-
+            //分娩时间
             temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
+            temp.put("scType", "--");
+
+            if(patients.getIsAutoFm()!=null&&patients.getIsAutoFm() == 1){
+                /** 生产方式 */
+                temp.put("scType", "自动分娩");
+            }else {
+                MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
+                matDeliverQuery.setParentId(patients.getId());
+                matDeliverQuery.setYn(YnEnums.YES.getId());
+                //查询分娩记录
+                List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
+                if(CollectionUtils.isNotEmpty(list2)){
+                    MaternalDeliverModel maternalDeliverModel = list2.get(0);
+                    /** 生产方式 */
+                    temp.put("scType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType()));
+                }
+            }
+            //初次复查时间
             temp.put("ccfcDate", "--");
+            //预约复查日期
             temp.put("yyfcDate ", "--");
 
 
@@ -346,8 +369,6 @@ public class TrackDownFacade {
                 /** 预约复查日期 */
                 temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
             }
-            /** 生产方式 */
-            temp.put("scType", FmTypeEnums.getFmNameById2("1"));
             return temp;
         }
     }
-- 
1.8.3.1