From 4717a653a60ed3675bfd6dfebaae90e01747d78f Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 8 Dec 2021 17:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=89=8D=E4=BC=98=E7=94=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9C=81=E5=B9=B3=E5=8F=B0=E7=8A=B6=E6=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/request/PreEugenicsBaseListRequest.java     | 10 ++++++++++
 .../operate/web/result/PreEugenicsBaseListResult.java       | 13 +++++++++++++
 .../operate/web/service/impl/PreEugebicsServiceImpl.java    |  5 ++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java
index 5f6a840..4290e26 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java
@@ -67,6 +67,16 @@ public class PreEugenicsBaseListRequest extends BaseQuery {
 
     //是否抽血 1不抽血
     private Integer checkBlood;
+    //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
+    private Integer isUploadingProvince;
+
+    public Integer getIsUploadingProvince() {
+        return isUploadingProvince;
+    }
+
+    public void setIsUploadingProvince(Integer isUploadingProvince) {
+        this.isUploadingProvince = isUploadingProvince;
+    }
 
     public Integer getCheckBlood() {
         return checkBlood;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
index c84759f..526918b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
@@ -88,6 +88,19 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
     private String doctorStr;
 
 
+    //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
+    private Integer isUploadingProvince;
+
+    @Override
+    public Integer getIsUploadingProvince() {
+        return isUploadingProvince;
+    }
+
+    @Override
+    public void setIsUploadingProvince(Integer isUploadingProvince) {
+        this.isUploadingProvince = isUploadingProvince;
+    }
+
     public String getHusbandAccountAddressStr() {
         return husbandAccountAddressStr;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index 4ad1cd9..9396df9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -367,6 +367,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
             end = DateUtil.getDayLastSecond(end);
             query.addCriteria(Criteria.where("fillDate").gte(start).lte(end));
         }
+        Integer isUploadingProvince = param.getIsUploadingProvince();
+        if (isUploadingProvince != null) {
+            query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
+        }
 
         query = getQueryByAddress(param, searchType, query);
 
@@ -532,7 +536,6 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
         setDoctorName(result.getHusbandClinicalCheck());
         setDoctorName(result.getHusbandOtherCheck());
         setDoctorName(result.getResultAdvice());
-
         return result;
     }
 
-- 
1.8.3.1