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> 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 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> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);