zjh
2024-02-21 d472027d8729cdf0ab010dfffc2e19249532291c
zjh 2024/02/21--1
5个文件已修改
41 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -13,6 +13,7 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.mapper.TestMapper;
@@ -79,6 +80,8 @@
    private ISysDeptService deptService;
    @Resource
    private LtkjHisUserService hisUserService;
    @Resource
    private ITjProjectService tjProjectService;
    @GetMapping("/getTjHyBgList")
    @ApiOperation(value = "查询lis数据库项目信息接口")
@@ -418,7 +421,22 @@
    @GetMapping("/getPacTjProjectList")
    @ApiOperation(value = "维护套餐页面新增项目时调用")
    public AjaxResult getPacTjProjectList() {
//        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//        wq.eq(TjProject::getProParentId, 0);
//        wq.eq(TjProject::getProStatus, 0);
        List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
//        if (tjProjects != null) {
//            for (TjProject project : tjProjects) {
//                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
//                project.setTjProjectList(projectList);
//            }
//            return AjaxResult.success(tjProjects);
//        }
        return AjaxResult.success(tjProjects);
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -181,6 +181,14 @@
    }
    @GetMapping("/getPacTjProjectList")
    @ApiOperation(value = "维护套餐页面新增项目时调用")
    public AjaxResult getPacTjProjectList() {
        List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
        return AjaxResult.success(tjProjects);
    }
    /**
     * 查询体检项目列表
     */
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -141,4 +141,10 @@
    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '体检',pro_name) ")
    List<TjProject> getDxTjProjectList();
    @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
            "tj_project a LEFT JOIN tj_project b ON b.pro_parent_id=a.pro_id WHERE\n" +
            "a.pro_parent_id=0 AND a.pro_status=0 AND a.pro_id=b.pro_parent_id  GROUP BY a.pro_id")
    List<TjProject> getPacTjProjectList();
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -110,4 +110,6 @@
    List<TjProject> getTjProjectList();
    List<TjProject> getDxTjProjectList();
    List<TjProject> getPacTjProjectList();
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -211,6 +211,11 @@
        return tjProjectMapper.getDxTjProjectList();
    }
    @Override
    public List<TjProject> getPacTjProjectList() {
        return tjProjectMapper.getPacTjProjectList();
    }
    /**
     * 递归列表
     */