From d7fe3f516181d673e594213657a44a78beb99c8b Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 14 Oct 2021 15:17:27 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/query/CancerScreeningQuery.java     | 15 +++++++++++++++
 .../operate/web/facade/CancerScreeningFacade.java         |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
index be299ea..876d689 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
@@ -101,7 +101,19 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ
 
     //1 未同步 2已经同步
     private Integer isSync;
+    /**
+     * 隆化-乳腺癌检查异常
+     */
+    //乳腺癌异常
+    private Integer breastAbnormity;
+
+    public Integer getBreastAbnormity() {
+        return breastAbnormity;
+    }
 
+    public void setBreastAbnormity(Integer breastAbnormity) {
+        this.breastAbnormity = breastAbnormity;
+    }
 
     /**
      * @return
@@ -181,6 +193,9 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ
         if(StringUtils.isNotEmpty(sfZhzd) ){
             condition=condition.and("sfZhzd.select",sfZhzd , MongoOper.IS);
         }
+        if(null!=breastAbnormity){
+            condition=condition.and("breastAbnormity", breastAbnormity, MongoOper.IS);
+        }
 
         Criteria c = null;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
index e920919..d0ad49c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
@@ -98,6 +98,8 @@ public class CancerScreeningFacade {
         query.setRxlJy(queryRequest.getRxlJy());
         query.setRxJy(queryRequest.getRxJy());
         query.setSfZhzd(queryRequest.getSfZhzd());
+        //隆化-乳腺癌检查异常
+        query.setBreastAbnormity(queryRequest.getBreastAbnormity());
 
         List list = new ArrayList();
         //System.out.println(query.convertToQuery().convertToMongoQuery());
@@ -119,6 +121,7 @@ public class CancerScreeningFacade {
                 map.put("sfZzjg", model.getSfZzjg());//检査机构
 
                 map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
+                map.put("breastAbnormity",RxaZdycEnums.getName(model.getBreastAbnormity().toString()));//检査日期
 
                 list.add(map);
             }
-- 
1.8.3.1