yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

This commit is contained in:
1378012178@qq.com 2025-07-23 08:38:30 +08:00
parent 1fad02dd3f f34b58b448
commit 592d0d1f75
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java
View File

@ -88,6 +88,7 @@ public class ConfigMaterialCategoryController extends JeecgController<ConfigMate
QueryWrapper<ConfigMaterialCategory> 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<ConfigMaterialCategory> page = new Page<ConfigMaterialCategory>(pageNo, pageSize);
IPage<ConfigMaterialCategory> pageList = configMaterialCategoryService.selectMaterialList(page, queryWrapper);
return Result.OK(pageList);
@ -104,6 +105,8 @@ public class ConfigMaterialCategoryController extends JeecgController<ConfigMate
@RequiresPermissions("ConfigMaterial:config_material_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ConfigMaterialCategory configMaterialCategory) {
List<ConfigMaterialCategory> list = configMaterialCategoryService.list();
configMaterialCategory.setSort(list.size()+1);
configMaterialCategoryService.save(configMaterialCategory);
return Result.OK("添加成功！");
}

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
View File

@ -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)

14
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java
View File

@ -113,20 +113,20 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
//查询护理分类信息
QueryWrapper<ConfigMaterialCategory> categoryQueryWrapper = new QueryWrapper<>();
categoryQueryWrapper.eq("iz_enabled","0");
// categoryQueryWrapper.eq("iz_enabled","0");
categoryQueryWrapper.eq("del_flag","0");
categoryQueryWrapper.orderByAsc("sort");
List<ConfigMaterialCategory> list =baseMapper.selectList(categoryQueryWrapper);
//查询护理类型信息
QueryWrapper<ConfigMaterialType> typeQueryWrapper = new QueryWrapper<>();
typeQueryWrapper.eq("iz_enabled","0");
// typeQueryWrapper.eq("iz_enabled","0");
typeQueryWrapper.eq("del_flag","0");
List<ConfigMaterialType> list2 = configMaterialTypeMapper.selectList(typeQueryWrapper);
//查询用药类型信息
QueryWrapper<ConfigMaterialMedication> medicationQueryWrapper = new QueryWrapper<>();
medicationQueryWrapper.eq("iz_enabled","0");
// medicationQueryWrapper.eq("iz_enabled","0");
medicationQueryWrapper.eq("del_flag","0");
List<ConfigMaterialMedication> list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper);
@ -141,6 +141,9 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
yylxMap.put("key",yylxPar.getId());
yylxMap.put("levle","3");
yylxMap.put("title",yylxPar.getMedicationName());
yylxMap.put("izEnabled",yylxPar.getIzEnabled());
yylxMap.put("categoryId",yylxPar.getCategoryId());
yylxMap.put("typeId",yylxPar.getTypeId());
yylxMapList.add(yylxMap);
}
}
@ -148,7 +151,10 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
wllxMap.put("parentId",par.getCategoryId());
wllxMap.put("title",par.getTypeName());
wllxMap.put("levle","2");
wllxMap.put("izEnabled",par.getIzEnabled());
wllxMap.put("children",yylxMapList);
wllxMap.put("categoryId",par.getCategoryId());
wllxMap.put("typeId",par.getId());
wllxMapList.add(wllxMap);
}
@ -166,7 +172,9 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
infoMap.put("key",par.getId());
infoMap.put("title",par.getCategoryName());
infoMap.put("levle","1");
infoMap.put("izEnabled",par.getIzEnabled());
infoMap.put("children",wllxMap2List);
infoMap.put("categoryId",par.getId());
infoMapList.add(infoMap);
}