From 67e390ca9b01ad09066d09de1df8d2730cdf4dc5 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 20 十一月 2024 14:43:32 +0800
Subject: [PATCH] zjh20241120
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 9 +++++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index ca71035..75860ff 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -270,7 +270,12 @@
// });
// }
- List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+ List<CsProVo> list = getCsProVos(tjNumber,false);
+ return AjaxResult.success(list);
+ }
+
+ public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
if (null != list && list.size() > 0) {
list.sort(new Comparator<CsProVo>() {
@Override
@@ -279,7 +284,7 @@
}
});
}
- return AjaxResult.success(list);
+ return list;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index b96b163..a22fa4c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -127,7 +127,7 @@
"WHERE\n" +
"re.type != 2 \n" +//and pro.need_report='Y'
"AND re.tj_number =#{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'")
- List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );
@Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index 898c6c0..e28320f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -48,7 +48,7 @@
List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber,String pacId);
- List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber,boolean sfzpacs);
List<TjOrderRemark> addHuaYanTable(String tjnumber);
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 3f982b5..c7af6a4 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
@@ -83,8 +83,8 @@
}
@Override
- public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber) {
- return mapper.cSWebGetProByTjNumAndOrderId(tjNumber);
+ public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber,boolean sfzpacs) {
+ return mapper.cSWebGetProByTjNumAndOrderId(tjNumber, sfzpacs);
}
@Override
--
Gitblit v1.8.0