zjh20250521

zjh

2025-05-21 aec7a21314655a61a90010684d5cf70d073476d1

zjh20250521

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

@@ -9,6 +9,7 @@

import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.injector.methods.UpdateById;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
@@ -665,5 +666,51 @@
    }


    @GetMapping("/getProListByBblx")
    @ApiOperation(value = "查询标本对应项目或未对应标本的项目")
    public AjaxResult getProListByBblx(@ApiParam(value = "标本类型")@RequestParam(required = false) String bblx) {
        try {
            List<TjProject> projectList =tjProjectService.getProListByBblx(bblx);
            return AjaxResult.success(projectList);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    @GetMapping("/delProByBblx")
    @ApiOperation(value = "删除项目对应标本")
    @Transactional
    public AjaxResult delProByBblx(@ApiParam(value = "项目ID")@RequestParam(required = false) String proId) {
        try {
            TjProject tjProject = tjProjectService.getById(proId);
            tjProject.setSpecimenType(null);
            tjProjectService.updateById(tjProject);
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }


    @GetMapping("/updateProByBblx")
    @ApiOperation(value = "修改所选项目的标本类型")
    @Transactional
    public AjaxResult updateProByBblx(@ApiParam(value = "项目ID集合")@RequestParam(required = false) List<String> proIds,
                                      @ApiParam(value = "标本类型")@RequestParam(required = false)String bblx) {
        try {
            if(null !=  proIds && !proIds.isEmpty()){
                for (String proId : proIds) {
                    TjProject tjProject = tjProjectService.getById(proId);
                    tjProject.setSpecimenType(bblx);
                    tjProjectService.updateById(tjProject);
                }
            }
            return AjaxResult.success();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }



}

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

@@ -1056,8 +1056,9 @@
    public AjaxResult preview(@RequestBody String data) {
        String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
        List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
        String value = configService.selectConfigByKey("path_filePath");
        if ("true".equals(is_batch_report_use_sql)) {
            return tjReportService.makeBatchReport(tjNumbers);
            return tjReportService.makeBatchReport(tjNumbers, value);
        } else {
            return makeReport(tjNumbers);
        }

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java

@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -230,6 +231,7 @@
    private String isSampling;

    @ApiModelProperty(value = "标本类型")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String specimenType;

    @ApiModelProperty(value = "检查部位")

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

@@ -199,4 +199,8 @@

    List<Map<String ,Object>> getLisViewList();


@Select("call getProListByBblx(#{bblx,mode=IN}) ")
    List<TjProject> getProListByBblx(@Param(value ="bblx")String bblx);

}

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

@@ -142,4 +142,6 @@

    List<Map<String, Object>> zdysqlcx(String sql);
    void zdysqlxg(String sql);

    List<TjProject> getProListByBblx(String bblx);
}

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

@@ -73,5 +73,5 @@
     * @param tjNumbers 体检号集合
     * @return
     */
    AjaxResult makeBatchReport(List<String> tjNumbers);
    AjaxResult makeBatchReport(List<String> tjNumbers,String value);
}

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

@@ -347,4 +347,9 @@
        tjProjectMapper.zdysqlxg(map);
    }

    @Override
    public List<TjProject> getProListByBblx(String bblx) {
        return tjProjectMapper.getProListByBblx(bblx);
    }

}

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

@@ -146,7 +146,7 @@
    }

//    @Value("${path.filePath}")
    private String value;
//    private String value;

//    @Override
//    public AjaxResult getTjReport(String tjNumber) {
@@ -520,8 +520,8 @@


    @Override
    public AjaxResult makeBatchReport(List<String> tjNumbers) {
        return sqlGetReportToMake(tjNumbers);
    public AjaxResult makeBatchReport(List<String> tjNumbers,String value) {
        return sqlGetReportToMake(tjNumbers,value);

    }

@@ -531,7 +531,7 @@
     * @param tjNumbers
     * @return
     */
    private AjaxResult sqlGetReportToMake(List<String> tjNumbers) {
    private AjaxResult sqlGetReportToMake(List<String> tjNumbers,String value) {
//        LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
//        tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
//        List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);