zjh 本地 2024/03/5 -2

zjh

2024-03-05 b6f742f5fd549231c46cccd11647946422a6e93a

zjh 本地 2024/03/5 -2

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

@@ -662,6 +662,9 @@
                    } else {
                        parent.put("parentAdvice", null);
                    }
                    if(dels.size()==0){
                        continue;
                    }
                    parent.put("sons", dels);
                    parent.put("remark", remark.getRemark());
                    if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) {

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

@@ -776,7 +776,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");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257","251","271");
        wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

@@ -828,6 +828,7 @@
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark,null);
        }
        List<Object> toRemoveKeys = new ArrayList<>();
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -842,7 +843,10 @@
                    }
            }
            printReport.put(entry.getKey(), tjPdfVOS);
            if(tjPdfVOS.size()==0)
            {toRemoveKeys.add(entry.getKey());}
        }
        toRemoveKeys.forEach(printReport::remove);
        return printReport;
    }


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

@@ -68,7 +68,7 @@


    @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.tj_number=#{tjNumber}" +
            " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257) ")//and a.dept_id in (269,270,253,254,255,257)
            " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);