From 281baeadd5d9bc3cb5c9c244fe84b8537508bc45 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 22 Jan 2024 14:08:41 +0800 Subject: [PATCH] =?UTF-8?q?manage=20:=20=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=8D=AF=E5=93=81=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/config/DrugManageController.java | 9 ++++----- .../supervision/manage/service/DrugManageService.java | 3 ++- .../manage/service/impl/DrugManageServiceImpl.java | 4 +++- .../src/main/java/com/supervision/model/ConfigDrug.java | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java index 522fbd38..8dbfd971 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java @@ -42,11 +42,10 @@ public class DrugManageController { @GetMapping("/queryPageList") public IPage queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, @RequestParam(defaultValue = "10")Integer pageSize, - @ApiParam("药品名称") - @RequestParam(required = false) String drugName, - @ApiParam("一级措施id") - @RequestParam(required = false) String firstMeasuresId ) { + @ApiParam("药品名称") @RequestParam(required = false) String drugName, + @ApiParam("一级措施id") @RequestParam(required = false) String firstMeasuresId, + @ApiParam("剂型") @RequestParam(required = false) String dosageForm ) { - return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId); + return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId,dosageForm); } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DrugManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DrugManageService.java index 98a803ee..70a39eeb 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DrugManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DrugManageService.java @@ -20,5 +20,6 @@ public interface DrugManageService { */ boolean updateDrug(ConfigDrug configDrug); - IPage queryPageList(Integer pageNum, Integer pageSize, String drugName,String firstMeasuresId); + IPage queryPageList(Integer pageNum, Integer pageSize, + String drugName,String firstMeasuresId,String dosageForm); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DrugManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DrugManageServiceImpl.java index 2f7c41cb..9e83e853 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DrugManageServiceImpl.java +++ b/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 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 page = wrapper.page(new Page<>(pageNum, pageSize)); // 添加 diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java index 3431e37e..b92adffa 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java +++ b/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;