From 3384318566afc671bbc6131b892fbdacb7a933aa Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sun, 7 Aug 2022 10:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/PreEugenicsBaseController.java  |  3 ---
 .../web/request/CervicalCancerListRequest.java     | 31 ++++++++++++++++++++++
 .../service/impl/CervicalCancerServiceImpl.java    |  9 +++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
index ac12c3c..f8af1ce 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
@@ -10,7 +10,6 @@ import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl;
 import com.lyms.platform.pojo.BasicConfig;
-import com.lyms.platform.pojo.CervicalCancerModel;
 import com.lyms.platform.pojo.PreEugenicsBaseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,8 +22,6 @@ import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.service.IPreEugenicsService;
 
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author: shuai-Bo
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java
index e3151a4..8e8e435 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java
@@ -38,6 +38,37 @@ public class CervicalCancerListRequest extends BaseQuery {
       */
     private Integer checkPackage;
 
+    //tbs分类
+    private String tbs;
+    //最后诊断
+    private String zhzdSelect;
+    //组织病理学诊断
+    private String zzblxSelect;
+
+    public String getTbs() {
+        return tbs;
+    }
+
+    public void setTbs(String tbs) {
+        this.tbs = tbs;
+    }
+
+    public String getZhzdSelect() {
+        return zhzdSelect;
+    }
+
+    public void setZhzdSelect(String zhzdSelect) {
+        this.zhzdSelect = zhzdSelect;
+    }
+
+    public String getZzblxSelect() {
+        return zzblxSelect;
+    }
+
+    public void setZzblxSelect(String zzblxSelect) {
+        this.zzblxSelect = zzblxSelect;
+    }
+
     public Integer getCheckPackage() {
         return checkPackage;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index 2914e1c..e1725cc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -206,6 +206,15 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
         }
         /*20201021 wtt 陵城需求 end */
 
+        if (StringUtils.isNotEmpty(param.getTbs())) {
+            query.addCriteria(Criteria.where("tbs").is(checkPackage));
+        }
+        if (StringUtils.isNotEmpty(param.getZhzdSelect())) {
+            query.addCriteria(Criteria.where("zhzdSelect."+param.getZhzdSelect()).is(true));
+        }
+        if (StringUtils.isNotEmpty(param.getZzblxSelect())) {
+            query.addCriteria(Criteria.where("zzblxSelect"+param.getZzblxSelect()).is(true));
+        }
         query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
         String provinceId = param.getProvinceId();
         if (StringUtils.isNotEmpty(provinceId)) {
-- 
1.8.3.1