From 2a64349a2c94a60f7959656f17efcc7bba06be56 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 8 Jul 2020 11:23:07 +0800
Subject: [PATCH] update

---
 .../src/main/java/com/lyms/platform/common/utils/DateUtil.java    | 2 +-
 .../com/lyms/platform/operate/web/controller/TestController.java  | 2 +-
 .../java/com/lyms/platform/operate/web/facade/ViewFacade.java     | 8 ++++----
 3 files changed, 6 insertions(+), 6 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 b130b21..9f2963a 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
@@ -1629,7 +1629,7 @@ public class DateUtil {
     public static void main(String[] args) {
 
         Date bir = parseYMD("1990-03-07");
-        Date bir1 = parseYMD("2019-03-04");
+        Date bir1 = parseYMD("2019-03-08");
         int i = DateUtil.getAge(bir, bir1);
         System.out.println(i);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 21a52b2..53bbb00 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -3696,7 +3696,7 @@ public class TestController extends BaseController {
     public void setBabyHospitalId()
     {
         BabyModelQuery babyModelQuery = new BabyModelQuery();
-        babyModelQuery.setDataStatus(true);
+        babyModelQuery.setFmDataStatu(true);
         babyModelQuery.setBuildType(2);
         babyModelQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -3));
         babyModelQuery.setCreatedTimeEnd(new Date());
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 4ad183c..da2fd12 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
@@ -6370,7 +6370,7 @@ public class ViewFacade {
             }
 
             List<Patients> list;
-            String patientId = getPatientId(idCard);
+            String patientId = getPatientId(idCard,hospitalId);
             if (StringUtils.isNotEmpty(patientId)) {
                 //衡水市
                 if ("12".equals(cityId))
@@ -6649,7 +6649,7 @@ public class ViewFacade {
      * @param idCard
      * @return patientId/null
      */
-    private String getPatientId(String idCard) {
+    private String getPatientId(String idCard,String hospitalId) {
         PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(idCard).and("type").ne(2)), PersonModel.class);
         if (personModel != null) {
             String personModelId = personModel.getId();
@@ -6657,8 +6657,8 @@ public class ViewFacade {
                     with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
             if (CollectionUtils.isNotEmpty(models)) {
                 MaternalDeliverModel deliverModel = models.get(0);
-                String parentId = deliverModel.getParentId();
-                Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(parentId)), Patients.class);
+                Patients patientsModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").
+                        is(deliverModel.getPid()).and("hospitalId").is(hospitalId).and("type").is(3).is(hospitalId).and("yn").is(YnEnums.YES.getId())), Patients.class);
                 if (patientsModel != null) {
                     return patientsModel.getId();
                 }
-- 
1.8.3.1