From fa2ca710bdeefbfbbe8777ac0cb6942e090b0aba Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 18 Sep 2024 10:28:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8Akey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/collect/IoCollectOriginController.java  | 2 +-
 .../java/com/glxp/api/req/basic/GetSickPrescribeRequest.java    | 1 +
 src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java | 1 +
 .../java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java     | 2 +-
 .../java/com/glxp/api/service/collect/down/YPCF002Download.java | 1 +
 5 files changed, 5 insertions(+), 2 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 33459fbc8..9ba849f6b 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
@@ -78,7 +78,7 @@ public class IoCollectOriginController extends BaseController {
         filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime());
         filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime());
         filterThrOrderRequest.setPage(collectOrderRequest.getPage());
-        filterThrOrderRequest.setKeywords(collectOrderRequest.getKeywords());
+        filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());
         BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
         return baseResponse;
     }
diff --git a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java
index 7749e2d6d..99afe26ee 100644
--- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java
@@ -14,6 +14,7 @@ public class GetSickPrescribeRequest extends ListPageRequest {
     private String startTime;
     private String endTime;
     private String thirdSys;
+    private String keyWords;
     /**
      *  住院号（必传)
      */
diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
index 6267e499c..c9b0c7af1 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -139,6 +139,7 @@ public class CollectOrderRequest extends ListPageRequest {
     private String startTime;
     private String endTime;
     private String keyWord;
+    private String keyWords;
 
     private List<String> documentTypeCodes;
 
diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java
index 106d15392..b75a802ca 100644
--- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java
@@ -46,5 +46,5 @@ public class FilterThrOrderRequest extends ListPageRequest {
 
     private String startTime;
     private String endTime;
-    private String keywords;//模糊 单据号、三方单据类型、发货方、收货方、单据时间，来源系统
+    private String keyWords;//模糊 单据号、三方单据类型、发货方、收货方、单据时间，来源系统
 }
diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
index a56d42c84..017dc784d 100644
--- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
+++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
@@ -35,6 +35,7 @@ public class YPCF002Download implements IDownload {
         getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
         getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
         getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
+        getSickPrescribeRequest.setKeyWords(collectOrderRequest.getKeyWords());
         while (true) {
             getSickPrescribeRequest.setPage(page);
             BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);