From fe3971a44cedd09a06c8d56cd99a7cf0e932f39e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 28 Oct 2019 15:52:28 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/common/utils/DateUtil.java   |  6 +--
 .../platform/operate/web/facade/ViewFacade.java    | 55 ++++++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 05ba2f1..cc94499 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1606,11 +1606,11 @@ public class DateUtil {
 //        String end = getyyyy_MM_dd(endDate);
 //
 //        System.out.println(start+"=="+end);
-        Date baby = parseDate("2018-09-26");
+        Date baby = parseDate("2019-10-24");
 
-        Date d = DateUtil.addDay(baby, 294);
+//        Date d = DateUtil.addDay(baby, 294);
 
-        System.out.println(getyyyy_MM_dd(d));
+        System.out.println(baby.getTime());
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index d1f157b..8704828 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -70,6 +70,9 @@ public class ViewFacade {
     private SieveFacade sieveFacade;
 
     @Autowired
+    private AntExRecordService recordService;
+
+    @Autowired
     private MatDeliverService matDeliverService;
     @Autowired
     private PostReviewService postReviewService;
@@ -5491,6 +5494,7 @@ public class ViewFacade {
 
             List<Map<String, Object>> deliverList = new ArrayList<>();
             List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
+
             if (CollectionUtils.isNotEmpty(list)) {
                 for (Patients pat : list) {
 
@@ -5505,18 +5509,46 @@ public class ViewFacade {
                     Map<String, Object> patientMap = new HashMap<>();
 
                     patientMap.put("mid", pat.getId());//
-                    patientMap.put("mbuilddate", DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间
+
+
+                    patientMap.put("mbuilddate", DateUtil.getyyyy_MM_dd(list.get(0).getBookbuildingDate()));// 建档时间
 
                     String buildHospital = "";
-                    if (StringUtils.isNotEmpty(pat.getHospitalId())) {
+                    if (StringUtils.isNotEmpty(list.get(0).getHospitalId())) {
                         Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId()));
                         if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                             buildHospital = organization.getName();
                         }
                     }
                     patientMap.put("mbuildhospital", buildHospital);//建档单位
-                    patientMap.put("mphone", pat.getPhone());
 
+                    AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
+                    antExRecordQuery1.setCheckTimeStart(pat.getLastMenses());
+                    antExRecordQuery1.setCheckTimeEnd(pat.getFmDate());
+                    antExRecordQuery1.setPid(pat.getPid());
+                    //本产程总产检次数
+                    int totalCount = recordService.count(antExRecordQuery1);
+
+                    patientMap.put("totalCount", totalCount);// 本产程总产检次数
+
+                    Organization organization = null;
+                    String fmHospital = "";
+                    if (StringUtils.isNotEmpty(datas.get(0).getFmHospital())) {
+                        if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getFmHospital())) {
+                            organization = organizationService.getOrganization(Integer.parseInt(datas.get(0).getFmHospital()));
+                            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                                fmHospital = organization.getName();
+                            }
+                        } else {
+                            fmHospital = pat.getFmHospital();
+                        }
+
+                    }
+                    patientMap.put("hospital", fmHospital);//接生单位
+
+
+
+                    patientMap.put("mphone", pat.getPhone());
 
                     patientMap.put("mname", pat.getUsername());//母亲姓名
                     patientMap.put("mcountry", getBasicConfig(pat.getPcountryId()));//母亲国籍
@@ -5559,23 +5591,6 @@ public class ViewFacade {
                         patientMap.put("faddress", "");//父亲户籍地址
                     }
 
-
-                    Organization organization = null;
-                    String fmHospital = "";
-                    if (StringUtils.isNotEmpty(datas.get(0).getFmHospital())) {
-                        if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getFmHospital())) {
-                            organization = organizationService.getOrganization(Integer.parseInt(datas.get(0).getFmHospital()));
-                            if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
-                                fmHospital = organization.getName();
-                            }
-                        } else {
-                            fmHospital = pat.getFmHospital();
-                        }
-
-                    }
-                    patientMap.put("hospital", fmHospital);//接生单位
-
-
                     if (CollectionUtils.isNotEmpty(datas)) {
                         String deliverDoctor = "";
                         if (StringUtils.isNotEmpty(datas.get(0).getDeliverDoctor())) {
-- 
1.8.3.1