From d5c02ffe86e10e403414dc14689eed4f455d7ad7 Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Tue, 27 Aug 2019 23:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=88=9B=E8=8E=B7=E5=8F=96=E5=80=BCbu?=
 =?UTF-8?q?g=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SieveFacade.java   |  8 +++---
 .../operate/web/request/SieveAddRequest.java       | 30 ++++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index b340502..73b39aa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -135,7 +135,7 @@ public class SieveFacade {
         if (CollectionUtils.isNotEmpty(list)) {
             SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
 
-            sieveModel1.setZtfx(sieveAddRequest.getMax());
+            sieveModel1.setZtfx(sieveAddRequest.getMax() != null ? sieveAddRequest.getMax() : 0);
             sieveModel1.setResultTime(sieveResultModel.getResultTime());
             SieveService.handOrder(sieveModel1);
             sieveModel1.setReportType(reportType);
@@ -2164,8 +2164,10 @@ public class SieveFacade {
     public void SieveHistory(Date startTime, Date endTime, String hospitalId) {
         SieveQuery sieveQuery = new SieveQuery();
         sieveQuery.setHospitalId(hospitalId);
-        sieveQuery.setCreatedStart(startTime);
-        sieveQuery.setCreatedEnd(endTime);
+        if (null != startTime && null != endTime) {
+            sieveQuery.setCreatedStart(startTime);
+            sieveQuery.setCreatedEnd(endTime);
+        }
         List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
         System.out.println("条数" + sieveQuery1.size());
         if (CollectionUtils.isNotEmpty(sieveQuery1)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
index bed0f77..4b31f60 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
@@ -13,7 +13,7 @@ import java.util.Map;
 
 /**
  * 增加产筛结果
- *
+ * <p>
  * Created by Administrator on 2016/6/29 0029.
  */
 public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
@@ -33,10 +33,10 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
     //结果录入时间
     private String resultTime;
 
-    private Map<String,String> tszhzValue;//  唐氏综合症 21-三体
-    private Map<String,String> sbstValue;//   18-三体
-    private Map<String,String> stzhz13Value; //13-三体
-    private Map<String,String> sjgjxValue;//  神经管畸形 NTD
+    private Map<String, String> tszhzValue;//  唐氏综合症 21-三体
+    private Map<String, String> sbstValue;//   18-三体
+    private Map<String, String> stzhz13Value; //13-三体
+    private Map<String, String> sjgjxValue;//  神经管畸形 NTD
 
     //hCg
     private String hcg;
@@ -236,7 +236,7 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
         private String cspj;//  产筛评价
         //录入人员
         private String publishName;*/
-        SieveResultModel sieveModel=new SieveResultModel();
+        SieveResultModel sieveModel = new SieveResultModel();
         sieveModel.setParentId(parentId);
         sieveModel.setId(id);
         sieveModel.setTszhz(tszhz);
@@ -262,24 +262,28 @@ public class SieveAddRequest implements IBasicRequestConvert<SieveResultModel> {
 
         return sieveModel;
     }
-    public Integer getMax(){
-        List<Integer> list =new ArrayList<>();
 
-        if(StringUtils.isNotEmpty(tszhz)){
+    public Integer getMax() {
+        List<Integer> list = new ArrayList<>();
+
+        if (StringUtils.isNotEmpty(tszhz)) {
             list.add(Integer.valueOf(tszhz));
         }
-        if(StringUtils.isNotEmpty(sjgjx)){
+        if (StringUtils.isNotEmpty(sjgjx)) {
             list.add(Integer.valueOf(sjgjx));
         }
-        if(StringUtils.isNotEmpty(sbst)){
+        if (StringUtils.isNotEmpty(sbst)) {
             list.add(Integer.valueOf(sbst));
         }
-        if(StringUtils.isNotEmpty(dzhpx)){
+        if (StringUtils.isNotEmpty(dzhpx)) {
             list.add(Integer.valueOf(dzhpx));
         }
-        if(StringUtils.isNotEmpty(stzhz13)){
+        if (StringUtils.isNotEmpty(stzhz13)) {
             list.add(Integer.valueOf(stzhz13));
         }
+        if (list.size() == 0) {
+            list.add(0);
+        }
         return Collections.max(list);
     }
 }
-- 
1.8.3.1