From 2359d57cf9074650c25956ae9591c1a2e43a873d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 16 五月 2025 17:28:10 +0800
Subject: [PATCH] zjh20250516
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 2105291..b3472f6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -8,6 +8,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
@@ -125,13 +126,23 @@
askWorkLog.setHarmTypeLogs(skuNos);
}
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ one.setTjLx(order.getTjCategory());
+
LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>();
wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
- final List<TjAskHistorys> list11 = historysService.list(wqq111);
+ wqq111.eq(TjAskHistorys::getDataType,1);
+ List<TjAskHistorys> list11 = historysService.list(wqq111);
one.setTjAskHistorysList(list11);
- TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
- one.setTjLx(order.getTjCategory());
+
+ wqq111 = new LambdaQueryWrapper<>();
+ wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
+ wqq111.eq(TjAskHistorys::getDataType,2);
+ list11 = historysService.list(wqq111);
+ one.setZhiyezzList(list11);
+
+
return AjaxResult.success(one);
}else {
TjAskMedicalHistory a = new TjAskMedicalHistory();
@@ -367,6 +378,7 @@
return toAjax(historysService.removeByIds(historyId));
}
+
/**
* 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
*/
--
Gitblit v1.8.0