zjh 本地 2024/02/28 -2

zjh

2024-02-28 fcc5d56c4fa7b269d96b8ef66a527fa6a7c90450

zjh 本地 2024/02/28 -2

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

@@ -724,6 +724,7 @@
        //20230323判断项目已检
        wq.ne(TjOrderDetail::getTjStatus, 0);
        wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
        wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);

        //遍历体检记录 将项目的具体信息
@@ -741,6 +742,7 @@
        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqq.ne(TjOrderRemark::getDeptId,"241");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {

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

@@ -158,4 +158,8 @@


    List<Long> getHuaYanKsProId(String ksId);


    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.dept_id in(269,270,253,254,255,257) AND a.need_report='Y'")
    List<Long> getNotCcCtXdtProId();
}

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

@@ -119,5 +119,7 @@

    List<Long> getHuaYanKsProId(String ksId);

    List<Long> getNotCcCtXdtProId();


}

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

@@ -231,6 +231,11 @@
        return tjProjectMapper.getHuaYanKsProId(ksId);
    }

    @Override
    public List<Long> getNotCcCtXdtProId() {
        return tjProjectMapper.getNotCcCtXdtProId();
    }

    /**
     * 递归列表
     */