feat: 下载处方key模糊、修复分页接口

src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java

@@ -117,6 +117,10 @@ public class BasicSkPrescribeController extends BaseController {
      */
     @PostMapping("/udiwms/basic/sk/prescribe/save")
     public BaseResponse sickerPrescribeSave(@RequestBody SickerPrescribeSaveRequest sickerPrescribeSaveRequest) {
+        String busType = sickerPrescribeSaveRequest.getBusType();
+        if (StrUtil.isBlank(busType))
+            return ResultVOUtils.error("请选择业务类型!");
+
         Integer stauts = sickerPrescribeSaveRequest.getStauts();
         if (stauts == 1) {
             List<IoCollectOrder> list = sickerPrescribeSaveRequest.getList();

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -5,12 +5,14 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusTypeConstant;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderOrigin;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
@@ -68,19 +70,38 @@ public class IoCollectOriginController extends BaseController {
 
     @PostMapping("/udiwms/basic/collect/origin/order/getThrOrderPage")
     public BaseResponse getThrOrders(@RequestBody CollectOrderRequest collectOrderRequest) {
-        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
-        filterThrOrderRequest.setLimit(collectOrderRequest.getLimit());
-        filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
-        filterThrOrderRequest.setThirdSys("thirdId");
-        filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
-        filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
-        filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
-        filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime());
-        filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime());
-        filterThrOrderRequest.setPage(collectOrderRequest.getPage());
-        filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());
-        BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
-        return baseResponse;
+        String busType = collectOrderRequest.getBusType();
+        if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务类型!");
+
+        if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
+            GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
+            getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit());
+            getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
+            getSickPrescribeRequest.setThirdSys("thirdId");
+            getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+            getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
+            getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
+            getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
+            getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
+            getSickPrescribeRequest.setPage(collectOrderRequest.getPage());
+            BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
+            return baseResponse;
+        } else {
+            FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+            filterThrOrderRequest.setLimit(collectOrderRequest.getLimit());
+            filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
+            filterThrOrderRequest.setThirdSys("thirdId");
+            filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
+            filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+            filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
+            filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime());
+            filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime());
+            filterThrOrderRequest.setPage(collectOrderRequest.getPage());
+            filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());
+            BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
+            return baseResponse;
+        }
+
     }
 
 

src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java

@@ -14,7 +14,7 @@ public class GetSickPrescribeRequest extends ListPageRequest {
     private String startTime;
     private String endTime;
     private String thirdSys;
-    private String keyWords;
+    private String key;
     /**
      *  住院号（必传)
      */