From c0111c959bf47deb09e1f14af537b1c56ca75a95 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 25 Nov 2024 17:39:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOriginController.java    | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
index 9d3aeae37..5a694fd7d 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
@@ -80,8 +80,12 @@ public class IoCollectOriginController extends BaseController {
             getSickPrescribeRequest.setThirdSys("thirdId");
             getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
             getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
-            getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
-            getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
+            if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
+                getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
+            }
+            if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
+                getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
+            }
             getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
             getSickPrescribeRequest.setPage(collectOrderRequest.getPage());
             getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName());
@@ -97,8 +101,12 @@ public class IoCollectOriginController extends BaseController {
             getSickPrescribeRequest.setThirdSys("thirdId");
             getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
             getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
-            getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
-            getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
+            if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
+                getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
+            }
+            if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
+                getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
+            }
             getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
             getSickPrescribeRequest.setPage(collectOrderRequest.getPage());
             getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName());
@@ -114,8 +122,12 @@ public class IoCollectOriginController extends BaseController {
             filterOrderRequest.setProductType(null);
             filterOrderRequest.setLimit(collectOrderRequest.getLimit());
             filterOrderRequest.setPage(collectOrderRequest.getPage());
-            filterOrderRequest.setStartTime(collectOrderRequest.getStartTime());
-            filterOrderRequest.setEndTime(collectOrderRequest.getEndTime());
+            if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
+                filterOrderRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
+            }
+            if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
+                filterOrderRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
+            }
             filterOrderRequest.setBillNo(collectOrderRequest.getBillNo());
             filterOrderRequest.setFromCorp(collectOrderRequest.getFromCorpName());
             filterOrderRequest.setAction(collectOrderRequest.getBusType());
@@ -130,8 +142,12 @@ public class IoCollectOriginController extends BaseController {
             filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
             filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
             filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
-            filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime());
-            filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime());
+            if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){
+                filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00");
+            }
+            if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){
+                filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59");
+            }
             filterThrOrderRequest.setPage(collectOrderRequest.getPage());
             filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());