From 89919412a7d94f87aea159b39d823e5d6014a20e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 21 十月 2024 10:52:21 +0800
Subject: [PATCH] zjh20241021
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 8 ++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 9 ++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 4 +++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2 ++
7 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index cd155b5..a1f37da 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
@@ -74,6 +75,7 @@
private TjSysAsyncServiceImpl tjSysAsyncService;
@Autowired
private LisApiMethod lisApiMethod;
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -249,7 +251,7 @@
}
}
}
- if (detailsDtos.size() > 0) {
+ if (!detailsDtos.isEmpty()) {
dto.setDetails(detailsDtos);
AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
String result5 = getAjaxResult(ajaxResult1);
@@ -286,6 +288,11 @@
tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
+ TjOrder tjOrder = orderService.getOrderByCardId(cardId);
+ if(null !=tjOrder){
+ List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
+ }
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 78f47f3..4ff949f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -848,7 +848,7 @@
TjProject project = projectService.getById(item.getProId());
return project != null && project.getProParentId() == 0;
}).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
tjOrderDetails = new ArrayList<>();
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -1026,7 +1026,7 @@
TjProject project = projectService.getById(item.getProId());
return project != null && project.getProParentId() == 0;
}).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
}
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1097,6 +1097,10 @@
ltkjJianchajianyanTreeService.save(tree);
}
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+
+ addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 82967ba..0665064 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -231,7 +231,7 @@
ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
for (TjSampling tjSampling : list) {
TjCustomer customer = customerService.getById(tjSampling.getCusId());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusName(customer.getCusName());
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(tjSampling.getTjNum());
@@ -268,6 +268,8 @@
}
for (TjSampling sampling : list) {
TjCustomer customer = customerService.getById(sampling.getCusId());
+ TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null !=order)sampling.setCardId(order.getCardId());
sampling.setCustomer(customer);
}
return AjaxResult.success(list);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
index efa15e7..7d0b56e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
@@ -40,6 +40,9 @@
@ApiModelProperty(value = "浣撴鍙�")
private String tjNum;
+ @TableField(exist = false)
+ private String cardId;
+
/**
* 閲囨牱缂栧彿
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 12d6efc..4fcb764 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -148,6 +148,9 @@
@Select("SELECT * FROM tj_order WHERE tj_number = #{tjNum} AND deleted='0' ")
public TjOrder getOrderByTjNum(String tjNum);
+ @Select("SELECT * FROM tj_order WHERE card_id = #{cardId} AND deleted='0' ")
+ public TjOrder getOrderByCardId(String cardId);
+
List<TjOrder> getTjOrderList(@Param("tjNum")String tjNum,
@Param("checkStatus")Integer checkStatus,
@Param("compId")Long compId,
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 8214f0f..f9cc0ae 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -97,6 +97,8 @@
public TjOrder getOrderByTjNum(String tjNum);
+ public TjOrder getOrderByCardId(String cardId);
+
//鎬绘 鏈紑鍚垵瀹�
List<TjOrder> getTjOrderList(String tjNum, Integer checkStatus, Long compId, Date beginTime, Date endTime);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 7e9addb..fc46b0c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -176,6 +176,11 @@
}
@Override
+ public TjOrder getOrderByCardId(String cardId) {
+ return tjOrderMapper.getOrderByCardId(cardId);
+ }
+
+ @Override
public List<TjOrder> getTjOrderList(String tjNum, Integer checkStatus, Long compId, Date beginTime, Date endTime) {
return tjOrderMapper.getTjOrderList(tjNum,checkStatus,compId,beginTime,endTime);
}
--
Gitblit v1.8.0