From 3dec90c4e5b1b71a1af2bdd855fda1591b53bc88 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十二月 2024 20:38:25 +0800
Subject: [PATCH] zjh202412017
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 90bd1e0..bd296ab 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
@@ -321,7 +321,7 @@
public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
@@ -1212,7 +1212,7 @@
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
-
+ Date date = new Date();
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1224,17 +1224,14 @@
tjOrder.setCheckStatus(checkStatus);
tjOrder.setStatus(TjConstants.TJ_CHECK);
tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(new Date());
+ tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
customer.setCusNumber(customer.getCusNumber() + 1);
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("鎿嶄綔鎴愬姛");
}
@@ -1382,14 +1379,14 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(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());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
--
Gitblit v1.8.0