zjh202412030

zjh

2024-12-30 34ff434a6d15cb4c55b2beed6b74058a9cd9019a

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

@@ -35,6 +35,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
@@ -1629,22 +1630,27 @@
    if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
            TjProject project = projectService.getById(tjOrderDetail.getProId());
            //判断该项目是否需要打印报告
            if ("N".equals(project.getNeedReport())) {
                continue;
            }
            List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
            tjOrderDetail.setRulesList(rulesList);
            tjOrderDetail.setProject(project);
            if (null != remark.getDoctorName()) {
                SysUser byId = userService.getById(remark.getDoctorName());
                if (byId != null) {
                    tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
            if(null != project){
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())) {
                    continue;
                }
            } else {
                tjOrderDetail.setDoctorName(null);
                List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
                tjOrderDetail.setRulesList(rulesList);
                tjOrderDetail.setProject(project);
                if (null != remark.getDoctorName()) {
                    SysUser byId = userService.getById(remark.getDoctorName());
                    if (byId != null) {
                        tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
                    }
                } else {
                    tjOrderDetail.setDoctorName(null);
                }
                if(StringUtil.isBlank(tjOrderDetail.getProResult())){
                    tjOrderDetail.setProResult(project.getProDefault());
                }
                tjOrderDetailList.add(tjOrderDetail);
            }
            tjOrderDetailList.add(tjOrderDetail);
        }
    }
    Map<String, Object> map = new HashMap<>();