From cffa6d524ea93a5976e1472c71ec60bc3a5ff490 Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Wed, 21 Aug 2019 11:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=8D=E8=AF=8A=E9=9A=8F?=
 =?UTF-8?q?=E8=AE=BF=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/ViewController.java     |  2 +-
 .../platform/operate/web/facade/ViewFacade.java    | 37 +++++++++-------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
index f6e2c15..29dc460 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
@@ -201,7 +201,7 @@ public class ViewController extends BaseController {
     @RequestMapping(value = "/printExFuData", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request, Integer state, String gravida) {
+    public BaseResponse printE0xFuData(@RequestParam("id") String id, HttpServletRequest request, Integer state, String gravida) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         if (loginState == null) {
             System.out.println("用户未登录!");
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 09a0f92..c217cc7 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
@@ -528,18 +528,18 @@ public class ViewFacade {
         String riskName = null;
         boolean flag = false;
         List<String> parentIdList = new ArrayList<>();
-        if ("0".equals(gravida)) {//表示全部孕妇处打印
+        if (null == antenatalExaminationModel) {//表示全部孕妇处打印
             patients = patientsService.findOnePatientById(id);
             if (patients != null) {
-                Calendar instance = Calendar.getInstance();
+             /*   Calendar instance = Calendar.getInstance();
                 instance.setTime(new Date());
                 instance.add(Calendar.DATE, -294);//只差未分娩的孕妇
                 instance.set(Calendar.HOUR_OF_DAY, 00);
                 instance.set(Calendar.MINUTE, 00);
                 instance.set(Calendar.SECOND, 00);
                 instance.set(Calendar.MILLISECOND, 000);
-                Date start = instance.getTime();
-                List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").gte(start)), Patients.class);
+                Date start = instance.getTime();*/
+                List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").is(patients.getLastMenses())), Patients.class);
                 if (CollectionUtils.isNotEmpty(patientsList)) {
                     for (Patients patients1 : patientsList) {
                         parentIdList.add(patients1.getId());
@@ -549,7 +549,17 @@ public class ViewFacade {
                 AntenatalExaminationModel antenatalExaminationModels = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())), AntenatalExaminationModel.class);
                 riskName = getRisk(antenatalExaminationModels.getRiskFactor(), antenatalExaminationModels.getOtherRisk());
             }
-        } else {
+        } else if (null != antenatalExaminationModel && state != 0) { //产检处打印全部的
+            patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
+            List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("lastMenses").is(patients.getLastMenses())), Patients.class);
+            if (CollectionUtils.isNotEmpty(patientsList)) {
+                for (Patients patients1 : patientsList) {
+                    parentIdList.add(patients1.getId());
+                }
+                flag = true;
+            }
+            riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk());
+        } else {//产检检查打印2-5次的
             patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
             riskName = getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk());
         }
@@ -591,13 +601,7 @@ public class ViewFacade {
             } else {
                 return mList;
             }
-            /*exData[0] = list.get(0);
-            exData[1] = list.get(1);
-            exData[2] = list.get(2);
-            exData[3] = list.get(3);*/
         }
-
-        // Map<String, Object> map = new HashMap<>();
         for (int i = 0; i < exData.length; i++) {
             Map<String, Object> map = new HashedMap();
             map.put("name", name);
@@ -605,17 +609,6 @@ public class ViewFacade {
             if (data == null) {
                 continue;
             }
-            /*String numStr = "";
-            if (i == 0) {
-                numStr = "one";
-            } else if (i == 1) {
-                numStr = "two";
-            } else if (i == 2) {
-                numStr = "thre";
-            } else if (i == 3) {
-                numStr = "four";
-            }*/
-
             if (data.getCheckDate() != null) {
                 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
             }
-- 
1.8.3.1