manage: 药物管理一级措施过滤选项

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

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

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);
+    IPage<ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId);
 }

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

@@ -55,10 +55,11 @@ public class DrugManageServiceImpl implements DrugManageService {
     }
 
     @Override
-    public IPage<ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName) {
+    public IPage<ConfigDrug> queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId) {
 
         LambdaQueryChainWrapper<ConfigDrug> wrapper = configDrugService.lambdaQuery()
-                .like(StrUtil.isNotEmpty(drugName), ConfigDrug::getDrugName, drugName);
+                .like(StrUtil.isNotEmpty(drugName), ConfigDrug::getDrugName, drugName)
+                .eq(StrUtil.isNotEmpty(firstMeasuresId), ConfigDrug::getFirstMeasuresId, firstMeasuresId);
 
         return wrapper.page(new Page<>(pageNum, pageSize));
     }

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

@@ -1,8 +1,6 @@
 package com.supervision.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -32,6 +30,9 @@ public class ConfigDrug implements Serializable {
      */
     private String drugNameEn;
 
+    @ApiModelProperty("一级措施id")
+    private String firstMeasuresId;
+
     /**
      * 规格
      */

virtual-patient-model/src/main/resources/mapper/ConfigDrugMapper.xml

@@ -8,6 +8,7 @@
             <result property="id" column="id" jdbcType="VARCHAR"/>
             <result property="drugName" column="drug_name" jdbcType="VARCHAR"/>
             <result property="drugNameEn" column="drug_name_en" jdbcType="VARCHAR"/>
+            <result property="firstMeasuresId" column="first_measures_id" jdbcType="VARCHAR"/>
             <result property="specification" column="specification" jdbcType="VARCHAR"/>
             <result property="dose" column="dose" jdbcType="BIGINT"/>
             <result property="unit" column="unit" jdbcType="VARCHAR"/>
@@ -23,7 +24,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,drug_name,drug_name_en,
+        id,drug_name,drug_name_en,first_measures_id,
         specification,dose,unit,
         interval_day,interval_hour,dosage_form,skin_test_flag,
         cost_type,create_user_id,create_time,