From 345f5654fee547c2f06f74c9eb4855c8bd1f8712 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 09 十二月 2024 19:03:41 +0800
Subject: [PATCH] zjh20241209
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 58 +++++++++++++++++++++++++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 2 +
7 files changed, 76 insertions(+), 4 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 729f3b4..fcbd62b 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
@@ -1460,7 +1460,7 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
@@ -1469,7 +1469,7 @@
parent.put("xmlb", remark.getXmlb());
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1495,7 +1495,7 @@
}else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
}else {
@@ -1523,7 +1523,7 @@
} else {
parent.put("parentAdvice", null);
}
- if (dels.size() == 0) {
+ if (dels.isEmpty()) {
continue;
}
parent.put("sons", dels);
@@ -1609,4 +1609,54 @@
return AjaxResult.success(map);
}
+
+
+ /**
+ * 鎬绘淇敼澶囨敞
+ *
+ * @return
+ */
+ @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
+ if (StrUtil.isNotBlank(tjNum)) {
+ return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+ return AjaxResult.error();
+ }
+
+ private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+ asyncService.updateCheckType(tjNumber);
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<Map<String, Object>> list = new ArrayList<>();
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ dels.add(tjOrderDetail);
+ }
+ }
+ if(!dels.isEmpty()){
+ parent.put("proName",remark.getProName());
+ parent.put("sone",dels);
+ list.add(parent);
+ }
+ } else {
+ return AjaxResult.success("璇ヤ汉鍛樻棤寮傚父椤圭洰");
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index b4b4ef4..0aa4c5d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -247,4 +247,8 @@
"LEFT JOIN sys_dept c ON c.dept_id=b.dept_id \n" +
" WHERE a.deleted=0 AND a.order_id=#{orderId} and b.pro_parent_id = 0 AND c.org_type=1 AND a.jxbz = #{jxbz}")
List<TjOrderDetail> getCaiYangDengJiJxbz(@Param("orderId") Long orderId,@Param("jxbz") String jxbz);
+
+
+ @Select("call tj_check_yclist(1,#{tjnumber,mode=IN})")
+ List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
}
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 d8e059a..9288736 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
@@ -169,4 +169,8 @@
"WHERE a.deleted=0 AND b.org_type=3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
// AND c.need_report='Y' guo
List<TjOrderRemark> notHuaYanData(String tjnumber);
+
+
+ @Select("call tj_check_yclist(0,#{tjnumber,mode=IN})")
+ List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
}
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 84f69cb..a640aae 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
@@ -122,4 +122,6 @@
List<TjOrderDetail> getCaiYangDengJi(Long orderId);
List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId,String jxbz);
+
+ List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
}
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 d3550d0..505714e 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
@@ -66,4 +66,6 @@
List<TjOrderRemark> notHuaYanData(String tjnumber);
+
+ List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 76f3993..849ebca 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -201,4 +201,9 @@
public List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId, String jxbz) {
return tjOrderDetailMapper.getCaiYangDengJiJxbz(orderId,jxbz);
}
+
+ @Override
+ public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
+ return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(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 163a1b6..19dbe0d 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
@@ -118,4 +118,9 @@
return mapper.notHuaYanData(tjnumber);
}
+ @Override
+ public List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
+ return mapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ }
+
}
--
Gitblit v1.8.0