manage : 分页查询药品添加查询字段

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

@@ -42,11 +42,10 @@ public class DrugManageController {
     @GetMapping("/queryPageList")
     public IPage<? extends ConfigDrug>  queryPageList(@RequestParam(defaultValue = "1")Integer pageNum,
                                            @RequestParam(defaultValue = "10")Integer pageSize,
-                                           @ApiParam("药品名称")
+                                           @ApiParam("药品名称") @RequestParam(required = false) String drugName,
-                                     @RequestParam(required = false) String drugName,
+                                           @ApiParam("一级措施id") @RequestParam(required = false) String firstMeasuresId,
-                                           @ApiParam("一级措施id")
+                                           @ApiParam("剂型") @RequestParam(required = false) String dosageForm ) {
-                                           @RequestParam(required = false) String firstMeasuresId  ) {
 
-        return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId);
+        return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId,dosageForm);
     }
 }

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

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

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

@@ -65,11 +65,13 @@ public class DrugManageServiceImpl implements DrugManageService {
     }
 
     @Override
-    public IPage< ? extends ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId) {
+    public IPage< ? extends ConfigDrug> queryPageList(Integer pageNum, Integer pageSize,
+                                                      String drugName,String firstMeasuresId,String dosageForm) {
 
         LambdaQueryChainWrapper<ConfigDrug> wrapper = configDrugService.lambdaQuery()
                 .like(StrUtil.isNotEmpty(drugName), ConfigDrug::getDrugName, drugName)
                 .eq(StrUtil.isNotEmpty(firstMeasuresId), ConfigDrug::getFirstMeasuresId, firstMeasuresId)
+                .eq(StrUtil.isNotEmpty(dosageForm),ConfigDrug::getDosageForm, dosageForm)
                 .orderByDesc(ConfigDrug::getCreateTime);
         Page<ConfigDrug> page = wrapper.page(new Page<>(pageNum, pageSize));
         // 添加

virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java

@@ -61,6 +61,7 @@ public class ConfigDrug implements Serializable {
     private Double intervalHour;
     /**
      * 剂型 用药途径：口服，静脉注射，静脉输液，皮下注射，局部用药，气雾剂/粉雾剂吸入，雾化吸入，鞘内注射，其他
+     * 参考通用字段 group = DOSE
      */
     private String dosageForm;