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