From ff76ba9c9c56aa2dd1c6a96d5d6365fbb3db1fad Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期六, 03 五月 2025 19:12:04 +0800
Subject: [PATCH] feat: 新增支付记录前端展示
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
index 8c5394c..2fa6031 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
@@ -13,9 +13,9 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.system.domain.DispatchOrd;
-import com.ruoyi.system.domain.TbOrders;
+import com.ruoyi.system.domain.*;
import com.ruoyi.system.service.IDispatchOrdService;
+import com.ruoyi.system.service.IPayInfoService;
import com.ruoyi.system.service.ITbOrdersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,7 +34,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.ServiceOrder;
import com.ruoyi.system.service.IServiceOrderService;
@@ -57,6 +56,9 @@
@Autowired
private IDispatchOrdService dispatchOrdService;
+
+ @Autowired
+ private IPayInfoService payInfoService;
/**
* 鑾峰彇鏈嶅姟璁㈠崟鍒楄〃
@@ -97,9 +99,9 @@
//鏌ヨ鏈嶅姟鍗�
ServiceOrder mingServiceOrder = serviceOrderService.selectServiceOrderById(Long.valueOf(orderDetail.getServiceOrdID()));
+
DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(mingServiceOrder.getServiceOrdId().toString());
-
Map<String, Object> data = new HashMap<>();
// 鏋勫缓璁㈠崟鍩烘湰淇℃伅
@@ -226,14 +228,49 @@
dispatchInfo.put("dispatchStatus","宸茶皟搴�");
}
+
+
+ //杞︾墝鍙�
+ String carLicense = dispatchOrdService.selectCarLicenseByCarId(Integer.valueOf(dispatchOrd.getDispatchOrdCarID()));
+ dispatchInfo.put("carLicense", carLicense);
}
+
+ //鐥呬汉鎯呭喌
+ Map<String, Object> medicalInfo = new HashMap<>();
+ medicalInfo.put("hasConsciousness", orderDetail.getSense());
+ medicalInfo.put("complaint",orderDetail.getComplaint());
+
+ //鏉′欢
+ List<DictionaryCondition> conditions = dispatchOrdService.selectDictionaryConditions();
+ List<Integer> conditionIds = dispatchOrdService.selectConditionIdsByServiceOrdCoId(Long.valueOf(orderDetail.getServiceOrdID()));
+
+ String patientCondition = "";//鐥呬汉鎯呭喌
+ String useVentilator = "";//浣跨敤鍛煎惛鏈�
+ for(DictionaryCondition condition : conditions){
+
+ if(conditionIds.contains(condition.getVID())){
+ patientCondition += condition.getVOrder2() + ": " + condition.getVtext() + "; ";
+ }
+
+ if(condition.getVOrder2().contains("鍛煎惛鏈�")){
+ useVentilator = condition.getVtext();
+ }
+ }
+
+ medicalInfo.put("patientCondition", patientCondition);
+ medicalInfo.put("useVentilator", useVentilator);
+
+
+ //鏀粯淇℃伅
+// List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //1016302788
+ List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");
data.put("orderInfo", orderInfo);
data.put("patientInfo", patientInfo);
data.put("serviceInfo", serviceInfo);
- data.put("medicalInfo", new HashMap<>()); // 鏆傛椂涓虹┖
+ data.put("medicalInfo", medicalInfo); // 鏆傛椂涓虹┖
data.put("dispatchInfo", dispatchInfo); // 鏇存柊涓哄寘鍚汉鍛樹俊鎭殑dispatchInfo
- data.put("paymentInfo", new ArrayList<>()); // 鏆傛椂涓虹┖
+ data.put("paymentInfo", payInfoList); // 鏆傛椂涓虹┖
data.put("operationInfo", new ArrayList<>()); // 鏆傛椂涓虹┖
return AjaxResult.success(data);
--
Gitblit v1.9.1