长泰视图对接

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -12,7 +12,9 @@ import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.client.ctqyy.entity.InvCodeResultEntity;
 import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity;
@@ -230,13 +232,13 @@ public class CtqyyClient extends CommonHttpClient {
                 return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
             }
         }else if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)){
-            Map map = new HashMap();
             LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper();
             //补充其他查询条件
             wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()),PhysicDictEntity::getPhysicCode,udiwmsProductRequest.getCode());
             wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()),PhysicDictEntity::getPhysicName,udiwmsProductRequest.getName());
             wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()),PhysicDictEntity::getPhysicNo,udiwmsProductRequest.getRegisterNo());
-            List<PhysicDictEntity> physicDictEntities = physicDictMapper.selectList(wrapper);
+            IPage<PhysicDictEntity> page = physicDictMapper.selectPage(new Page<PhysicDictEntity>(udiwmsProductRequest.getPage(),udiwmsProductRequest.getLimit()),wrapper);
+            List<PhysicDictEntity> physicDictEntities = page.getRecords();
             List<ThrProductsEntity> thrProductsEntityList = null;
             if(CollUtil.isNotEmpty(physicDictEntities)){
                 //数据处理以thr_products 返回
@@ -250,8 +252,10 @@ public class CtqyyClient extends CommonHttpClient {
                     return products;
                 }).collect(Collectors.toList());
             }
-            map.put("list",thrProductsEntityList);
+            PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
-            return ResultVOUtils.success(map);
+            pageSimpleResponse.setTotal(page.getTotal());
+            pageSimpleResponse.setList(thrProductsEntityList);
+            return ResultVOUtils.success(pageSimpleResponse);
         }
         log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType());
         return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getProductType());
@@ -1351,10 +1355,10 @@ public class CtqyyClient extends CommonHttpClient {
      */
     @Override
     public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
-        Map map = new HashMap();
         LambdaQueryWrapper<PresInfoEntity> wrapper = new LambdaQueryWrapper();
         //补充其他查询条件
-        List<PresInfoEntity> presInfoEntities = presInfoMapper.selectList(wrapper);
+        IPage<PresInfoEntity> page = presInfoMapper.selectPage(new Page<PresInfoEntity>(udiwmsBasicSkPrescribeRequest.getPage(),udiwmsBasicSkPrescribeRequest.getLimit()),wrapper);
+        List<PresInfoEntity> presInfoEntities = page.getRecords();
         List<BasicSkPrescribeResponse> basicSkPrescribeResponses = null;
         if(CollUtil.isNotEmpty(presInfoEntities)){
             //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
@@ -1370,8 +1374,10 @@ public class CtqyyClient extends CommonHttpClient {
                 return basicSkPrescribeResponse;
             }).collect(Collectors.toList());
         }
-        map.put("list",basicSkPrescribeResponses);
+        PageSimpleResponse<BasicSkPrescribeResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        return ResultVOUtils.success(map);
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(basicSkPrescribeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
 
@@ -1382,10 +1388,10 @@ public class CtqyyClient extends CommonHttpClient {
      */
     @Override
     public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
-        Map map = new HashMap();
         LambdaQueryWrapper<PlanInfoEntity> wrapper = new LambdaQueryWrapper<>();
         //补充其他查询条件
-        List<PlanInfoEntity> planInfoEntities = planInfoMapper.selectList(wrapper);
+        IPage<PlanInfoEntity> page = planInfoMapper.selectPage(new Page<PlanInfoEntity>(udiwmsThrOrderRequest.getPage(),udiwmsThrOrderRequest.getLimit()),wrapper);
+        List<PlanInfoEntity> planInfoEntities = page.getRecords();
         List<ThrOrderResponse> thrOrderResponses = null;
         if(CollUtil.isNotEmpty(planInfoEntities)){
             //数据处理以thr_order，thr_order_detail 主子返回
@@ -1401,8 +1407,10 @@ public class CtqyyClient extends CommonHttpClient {
                 return thrOrderResponse;
             }).collect(Collectors.toList());
         }
-        map.put("list",thrOrderResponses);
+        PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        return ResultVOUtils.success();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(thrOrderResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
 }