Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-06-27 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -1,11 +1,15 @@
package com.ltkj.hosp.service;

import java.util.List;
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;

/**
@@ -62,12 +66,18 @@
     * @return 结果
     */
    public int deleteTjOrderDetailByOrderDetailId(String orderDetailId);
    public int deleteTjOrderDetailByOrderId(String orderId);


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

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



@@ -77,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);
@@ -91,7 +113,43 @@

    List<TjOrderDetail> getTjOrderDetailList(String startDate,String endDate);

    boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
    boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);

    boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId,String sl);


    boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId,String cardId);

    boolean updateTjOrderDetailsByOrderId(String orderId,String userName, String userId,String ls);

    public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId,Long proParentId);

    public List<TjOrderDetail> getDetailByOrderIdAndParIds(Long orderId,List<Long> proParentIds);


    List<TjOrderDetail> addHuaYanTable(String tjnumber);

    List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);

    void deleteTjOrderDetailByjxbz(String jxbz);



    List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);



    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);
}