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/impl/TjOrderRemarkServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index a7d8037..6084973 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -9,10 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鍖荤敓澶囨敞Service涓氬姟灞傚鐞�
@@ -88,6 +85,11 @@
@Override
public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber,boolean sfzpacs) {
return mapper.cSWebGetProByTjNumAndOrderId(tjNumber, sfzpacs);
+ }
+
+ @Override
+ public List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber) {
+ return mapper.cSWebGetProByTjNumAndOrderIdJy(tjNumber);
}
@Override
@@ -167,8 +169,13 @@
}
@Override
- public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, List<Integer> split) {
+ public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, Set<Integer> split) {
return mapper.yiShengJianChaGetPrentPro(tjNumber,split);
+ }
+
+ @Override
+ public List<TjOrderRemark> yiShengJianChaYjGetPrentPro(String tjNumber, Set<Integer> split) {
+ return mapper.yiShengJianChaYjGetPrentPro(tjNumber,split);
}
@Override
@@ -177,8 +184,39 @@
}
@Override
+ public List<TjOrderRemark> yiShengJianChaYjGetPrentProCJGLY(String tjNumber) {
+ return mapper.yiShengJianChaYjGetPrentProCJGLY(tjNumber);
+ }
+
+ @Override
public List<CsProVo> ysjcGetProByTjNumAndOrderId(String tjNumber) {
return mapper.ysjcGetProByTjNumAndOrderId(tjNumber);
}
+ @Override
+ public List<TjOrderRemark> shoufeiyemianyishoufei(String tjNumber, String jxbz) {
+ return mapper.shoufeiyemianyishoufei(tjNumber,jxbz);
+ }
+
+ @Override
+ public List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber, String jxbz) {
+ return mapper.shoufeiyemianweishoufei(tjNumber,jxbz);
+ }
+
+ @Override
+ public List<CsProVo> getYxJcXx(String tjNumber,String ks) {
+ List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber,ks);
+ return yxJcXx;
+ }
+
+ @Override
+ public int updateTjOrderRemarkByTjzt(String tjNumber,String proId) {
+ return mapper.updateTjOrderRemarkByTjzt(tjNumber, proId);
+ }
+
+ @Override
+ public void csymxmxzqtyybcjk(String tjNum, String proId, String yy, String orgType, String czy, String czydm) {
+ mapper.csymxmxzqtyybcjk( tjNum, proId, yy, orgType, czy, czydm);
+ }
+
}
--
Gitblit v1.8.0