zjh20241120

zjh

2024-11-20 67e390ca9b01ad09066d09de1df8d2730cdf4dc5

zjh20241120

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

@@ -270,7 +270,12 @@
//            });
//        }

        List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
        List<CsProVo> list = getCsProVos(tjNumber,false);
        return AjaxResult.success(list);
    }

    public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
        List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
        if (null != list && list.size() > 0) {
            list.sort(new Comparator<CsProVo>() {
                @Override
@@ -279,7 +284,7 @@
                }
            });
        }
        return AjaxResult.success(list);
        return list;
    }



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

@@ -127,7 +127,7 @@
            "WHERE\n" +
            "re.type != 2  \n" +//and pro.need_report='Y'
            "AND re.tj_number =#{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%费%'")
    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
    List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );


    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")

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

@@ -48,7 +48,7 @@

    List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber,String pacId);

    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
    List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber,boolean sfzpacs);


    List<TjOrderRemark> addHuaYanTable(String tjnumber);

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

@@ -83,8 +83,8 @@
    }

    @Override
    public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber) {
        return mapper.cSWebGetProByTjNumAndOrderId(tjNumber);
    public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber,boolean sfzpacs) {
        return mapper.cSWebGetProByTjNumAndOrderId(tjNumber, sfzpacs);
    }

    @Override