manage : 药物分页查询增加翻译字段

virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java

@@ -40,7 +40,7 @@ public class DrugManageController {
 
     @ApiOperation("分页查询药物信息")
     @GetMapping("/queryPageList")
-    public IPage<ConfigDrug> queryPageList(@RequestParam(defaultValue = "1")Integer pageNum,
+    public IPage<? extends ConfigDrug>  queryPageList(@RequestParam(defaultValue = "1")Integer pageNum,
                                            @RequestParam(defaultValue = "10")Integer pageSize,
                                            @ApiParam("药品名称")
                                      @RequestParam(required = false) String drugName,

virtual-patient-manage/src/main/java/com/supervision/manage/service/DrugManageService.java

@@ -20,5 +20,5 @@ public interface DrugManageService {
      */
     boolean updateDrug(ConfigDrug configDrug);
 
-    IPage<ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId);
+    IPage<? extends ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId);
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DrugManageServiceImpl.java

@@ -1,22 +1,30 @@
 package com.supervision.manage.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.manage.service.ConfigTreatmentPlanManageService;
 import com.supervision.manage.service.DrugManageService;
+import com.supervision.model.CommonDic;
 import com.supervision.model.ConfigDrug;
 import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseTreatmentPlanDrug;
+import com.supervision.service.CommonDicService;
 import com.supervision.service.ConfigDrugService;
 import com.supervision.service.ConfigTreatmentPlanService;
 import com.supervision.service.DiseaseTreatmentPlanDrugService;
+import com.supervision.vo.manage.ConfigDrugResVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class DrugManageServiceImpl implements DrugManageService {
@@ -24,6 +32,8 @@ public class DrugManageServiceImpl implements DrugManageService {
     private final ConfigDrugService configDrugService;
 
     private final DiseaseTreatmentPlanDrugService diseaseTreatmentPlanDrugService;
+
+    private final CommonDicService commonDicService;
     @Override
     public ConfigDrug saveDrug(ConfigDrug configDrug) {
         Assert.notEmpty(configDrug.getDrugName(), "药品名称不能为空");
@@ -55,13 +65,26 @@ public class DrugManageServiceImpl implements DrugManageService {
     }
 
     @Override
-    public IPage<ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId) {
+    public IPage< ? extends ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId) {
 
         LambdaQueryChainWrapper<ConfigDrug> wrapper = configDrugService.lambdaQuery()
                 .like(StrUtil.isNotEmpty(drugName), ConfigDrug::getDrugName, drugName)
                 .eq(StrUtil.isNotEmpty(firstMeasuresId), ConfigDrug::getFirstMeasuresId, firstMeasuresId)
                 .orderByDesc(ConfigDrug::getCreateTime);
+        Page<ConfigDrug> page = wrapper.page(new Page<>(pageNum, pageSize));
+        // 添加
+        if (CollUtil.isEmpty(page.getRecords())){
+            return page;
+        }
+        Map<String, String> dose = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "DOSE")
+                .list().stream().collect(Collectors.toMap(CommonDic::getCode, CommonDic::getNameZh, (v1, v2) -> v1));
 
-        return wrapper.page(new Page<>(pageNum, pageSize));
+        return page.convert(record -> {
+            ConfigDrugResVo bean = BeanUtil.toBean(record, ConfigDrugResVo.class);
+            if (ObjectUtil.isNotEmpty(record.getDosageForm())) {
+                bean.setDosageFormDesc(dose.get(record.getDosageForm()));
+            }
+            return bean;
+        });
     }
 }

virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigDrugResVo.java

@@ -0,0 +1,14 @@
+package com.supervision.vo.manage;
+
+import com.supervision.model.ConfigDrug;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigDrugResVo extends ConfigDrug {
+
+    @ApiModelProperty("剂型中文名")
+    private String dosageFormDesc;
+}