修改补录错误问题

赵文轩

2024-10-30 7068ab4307920f2f03f3caeef99380b8b546a550

修改补录错误问题

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -828,7 +828,7 @@
            }

        }
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz);
        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);

        tjOrderDetails = new ArrayList<>();
@@ -995,7 +995,7 @@
//                }
            }

            List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
            List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz);
            addCaiYangDengJi(detailLists,!detailLists.isEmpty(), order, sysUser,jxbz);
        }


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

@@ -242,4 +242,9 @@
            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
            " WHERE a.deleted=0 AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1")
    List<TjOrderDetail> getCaiYangDengJi(Long orderId);

    @Select("SELECT a.* FROM tj_order_detail a LEFT JOIN tj_project b ON a.pro_id=b.pro_id \n" +
            "LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
            " WHERE a.deleted=0 AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1 AND a.jxbz = #{jxbz}")
    List<TjOrderDetail> getCaiYangDengJiJxbz(@Param("orderId") Long orderId,@Param("jxbz") String jxbz);
}

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

@@ -121,4 +121,5 @@


    List<TjOrderDetail> getCaiYangDengJi(Long orderId);
    List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId,String jxbz);
}

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

@@ -197,4 +197,8 @@
        return tjOrderDetailMapper.getCaiYangDengJi(orderId);
    }

    @Override
    public List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId, String jxbz) {
        return tjOrderDetailMapper.getCaiYangDengJiJxbz(orderId,jxbz);
    }
}