From 830d4de2774bb3a0c8aea76590692fbaab7473e7 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 22 Jul 2025 14:32:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterialCategoryController.java | 2 ++ .../entity/ConfigMaterialCategory.java | 2 ++ .../impl/ConfigMaterialCategoryServiceImpl.java | 14 +++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java index 0b158ae..9a2228c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java @@ -104,6 +104,8 @@ public class ConfigMaterialCategoryController extends JeecgController add(@RequestBody ConfigMaterialCategory configMaterialCategory) { + List list = configMaterialCategoryService.list(); + configMaterialCategory.setSort(list.size()+1); configMaterialCategoryService.save(configMaterialCategory); return Result.OK("添加成功！"); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java index 20b90ca..01d76f7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -70,6 +70,8 @@ public class ConfigMaterialCategory implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + private Integer sort; + @TableField(exist = false) private String typeName; @TableField(exist = false) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index befe81a..11b9fa7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -113,20 +113,20 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl categoryQueryWrapper = new QueryWrapper<>(); - categoryQueryWrapper.eq("iz_enabled","0"); +// categoryQueryWrapper.eq("iz_enabled","0"); categoryQueryWrapper.eq("del_flag","0"); categoryQueryWrapper.orderByAsc("sort"); List list =baseMapper.selectList(categoryQueryWrapper); //查询护理类型信息 QueryWrapper typeQueryWrapper = new QueryWrapper<>(); - typeQueryWrapper.eq("iz_enabled","0"); +// typeQueryWrapper.eq("iz_enabled","0"); typeQueryWrapper.eq("del_flag","0"); List list2 = configMaterialTypeMapper.selectList(typeQueryWrapper); //查询用药类型信息 QueryWrapper medicationQueryWrapper = new QueryWrapper<>(); - medicationQueryWrapper.eq("iz_enabled","0"); +// medicationQueryWrapper.eq("iz_enabled","0"); medicationQueryWrapper.eq("del_flag","0"); List list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); @@ -141,6 +141,9 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl Date: Tue, 22 Jul 2025 15:36:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConfigMaterialCategoryController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java index 9a2228c..3c12be7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java @@ -88,6 +88,7 @@ public class ConfigMaterialCategoryController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configMaterialCategory, req.getParameterMap()); queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getCategoryId()),"category_id",configMaterialCategory.getCategoryId()); queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getTypeId()),"type_id",configMaterialCategory.getTypeId()); + queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getMedicationId()),"id",configMaterialCategory.getMedicationId()); Page page = new Page(pageNo, pageSize); IPage pageList = configMaterialCategoryService.selectMaterialList(page, queryWrapper); return Result.OK(pageList);