From d562d492f5122864c5f74aade5f145baa026a705 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 1 Dec 2020 15:26:33 +0800
Subject: [PATCH] undate

---
 .../src/main/java/com/lyms/platform/query/PatientsQuery.java  |  6 +++++-
 .../lyms/platform/operate/web/facade/BookbuildingFacade.java  |  1 +
 .../lyms/platform/operate/web/result/PregnantInfoResult.java  | 11 ++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 0285e2e..3df5fcd 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -602,7 +602,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS);
         }
         if (StringUtils.isNotEmpty(screening)) {
-            condition = condition.and("screening", screening, MongoOper.IS);
+            if("1".equals(screening)){
+                condition = condition.and("screening", "2", MongoOper.NE);
+            }else if("2".equals(screening)){
+                condition = condition.and("screening", screening, MongoOper.IS);
+            }
         }
 
         if (isFace) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index f278199..d49fd82 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1996,6 +1996,7 @@ public class BookbuildingFacade {
                 doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : "");
                 result.setYyzyfmHospitalId(doctorObj);
             }
+            result.setScreening(p.getScreening());
             result.setFilePath(filePath);
             /** 末次月经和纠正末次月经反起来返回 */
             if (p.getFuckLastMens() != null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
index 5631cff..3c30da4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
@@ -10,7 +10,8 @@ import java.util.Map;
  */
 public class PregnantInfoResult {
     private Map<String, String> yyzyfmHospitalId;
-
+    /*20201130  null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */
+    private String screening;
     // 纠正末次月经
     private String fuckLastMens;
     // 末次月经纠正依据
@@ -99,6 +100,14 @@ public class PregnantInfoResult {
         this.patientSerResults = patientSerResults;
     }
 
+    public String getScreening() {
+        return screening;
+    }
+
+    public void setScreening(String screening) {
+        this.screening = screening;
+    }
+
     public List<Map<String, String>> getSerInfos() {
         return serInfos;
     }
-- 
1.8.3.1