From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index dfadd4b..5040e25 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/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,9 +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);
}
--
Gitblit v1.8.0