From bf84842d69b99d79ee17996de65bf8a2bab4ac07 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 26 十二月 2023 11:13:58 +0800
Subject: [PATCH] zjh 本地 2023/12/26 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 9652d00..9d8e7ad 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,13 +270,11 @@
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
tjOrder.setConfirmTime(new DateTime());
tjOrder.setConfirmDoctor(sysUser.getNickName());
- tjOrder.setConfirmStatus(remark);
+ tjOrder.setConfirmStatus(String.valueOf(status));
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
asyncService.updateCheckType(tjNumber);
@@ -494,6 +492,7 @@
if (customerService.updateById(customer)) {
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+ wqq.eq(TbTransition::getCardId,customer.getCardId());
transitionService.remove(wqq);
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
@@ -543,6 +542,10 @@
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
TjProject project = projectService.selectTjProjectByProId(remark.getProId());
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(project.getNeedReport())){
+ continue;
+ }
if (null != project) {
parent.put("parent", project.getProName());
parent.put("parentId", project.getProId().toString());
@@ -590,7 +593,6 @@
} else {
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
}
-// }
}
return AjaxResult.success(list);
}
--
Gitblit v1.8.0