zjh 本地 2024/06/24 --1

zjh

2024-06-24 39c2e5287bbe928a7eaac94f7c0687e92a4f5b96

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java

@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.redis.RedisCache;
@@ -83,11 +84,11 @@
     */
    @GetMapping("/getDxList")
    @ApiOperation(value = "选择体检项目选单项时调用的接口")
    public AjaxResult getDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
    public AjaxResult getDxList(@RequestParam(required = false) String pname) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList();
            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
        }
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
@@ -275,6 +276,7 @@
        if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
            tjProject.setProStandard(1);
        }
        tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
        if (tjProjectService.save(tjProject)) {
            if (null != tjProject.getSfxmId()) {
                DictProSfxm proSfxm = new DictProSfxm();
@@ -347,6 +349,7 @@
                return AjaxResult.error("该项目正在套餐中使用,暂时不能停用");
            }
        }
        tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
        if (tjProject.getProParentId() == 0) {
            if (tjProjectService.updateById(tjProject)) {
                if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
@@ -542,11 +545,11 @@
     */
    @GetMapping("/getProParentIdDxList")
    @ApiOperation(value = "选择体检项目(所有服项目)选单项时调用的接口")
    public AjaxResult getProParentIdDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
    public AjaxResult getProParentIdDxList(@RequestParam(required = false) String pname) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList();
            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();