From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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 37da57f..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
@@ -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);
@@ -96,7 +115,7 @@
boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);
- boolean saveJSYTjOrderDetailsByCusId(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);
@@ -117,4 +136,20 @@
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