zjh 本地 2024/06/24 --1

zjh

2024-06-24 1976a2d297317067d7afe5f51df4615a6eba80af

zjh 本地 2024/06/24 --1

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

@@ -84,11 +84,11 @@
     */
    @GetMapping("/getDxList")
    @ApiOperation(value = "选择体检项目选单项时调用的接口")
    public AjaxResult getDxList(@RequestParam(required = false) String pname) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
    public AjaxResult getDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
@@ -545,11 +545,11 @@
     */
    @GetMapping("/getProParentIdDxList")
    @ApiOperation(value = "选择体检项目(所有服项目)选单项时调用的接口")
    public AjaxResult getProParentIdDxList(@RequestParam(required = false) String pname) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
    public AjaxResult getProParentIdDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java

@@ -142,15 +142,8 @@
    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '体检',pro_name) ")
    List<TjProject> getDxTjProjectList();

    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '体检',pro_name) AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
    List<TjProject> getDxTjProjectList(String pname);

    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
    List<TjProject> getOpenDxTjProjectList();


    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
    List<TjProject> getOpenDxTjProjectList(String pname);


    @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java

@@ -108,9 +108,9 @@
    List<TjProject> getAllChildListById(String proId);

    List<TjProject> getTjProjectList();
    List<TjProject> getDxTjProjectList(String pname);
    List<TjProject> getDxTjProjectList();

    List<TjProject> getOpenDxTjProjectList(String pname);
    List<TjProject> getOpenDxTjProjectList();

    List<TjProject> getPacTjProjectList();


 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java

@@ -207,18 +207,12 @@
    }

    @Override
    public List<TjProject> getDxTjProjectList(String pname) {
        if(null !=pname && !"".equals(pname)){
            return tjProjectMapper.getDxTjProjectList(pname);
        }
    public List<TjProject> getDxTjProjectList() {
        return tjProjectMapper.getDxTjProjectList();
    }

    @Override
    public List<TjProject> getOpenDxTjProjectList(String pname) {
        if(null !=pname && !"".equals(pname)){
            return  tjProjectMapper.getOpenDxTjProjectList(pname);
        }
    public List<TjProject> getOpenDxTjProjectList() {
        return  tjProjectMapper.getOpenDxTjProjectList();
    }