Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-06-27 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -4,9 +4,11 @@
import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.vo.ProFcListVo;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.Select;

@@ -72,6 +74,11 @@
     */
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId);

    /**
     * 查询已缴费项目
     */
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullN(String orderId,String jxbz);




@@ -80,6 +87,18 @@
     * 查询未缴费项目
     */
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNull(String orderId);

    /**
     * 查询未缴费项目
     */
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(String orderId);

    /**
     * 查询未缴费项目
     */
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullN(String orderId,String jxbz);

    List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(String orderId);


    public List<TjOrderDetail> getTjOrderDetailListByOrderId(String orderId);
@@ -121,4 +140,16 @@


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

    List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
    List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num,String tjNumber);

    void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls);

    void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls);

    List<ProFcListVo> getFcList(Long orderId, Integer type);

    AjaxResult updFcPro(String json);
}