From 00c657c1f695771d625e28d958bd3e57fb56da58 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期六, 03 五月 2025 19:46:20 +0800
Subject: [PATCH] feat: 新增发票和评价
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 2fa6031..2e805b7 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
@@ -265,13 +265,42 @@
// List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //1016302788
List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");
+ //鍏朵粬淇℃伅
+ Map<String, Object> otherInfo = new HashMap<>();
+ //璇勪环
+ otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "鏃�"));
+
+ //鍙戠エ鑾峰彇
+ Map<String, Object> invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
+ String invoiceStatus = "";
+ if (invoiceInfo != null && invoiceInfo.get("AuditStatus") != null) {
+ switch (String.valueOf(invoiceInfo.get("AuditStatus"))) {
+ case "0":
+ invoiceStatus = "鏈鐞�";
+ break;
+ case "1":
+ invoiceStatus = "寤跺悗澶勭悊";
+ break;
+ case "3":
+ invoiceStatus = "宸插紑绁�";
+ break;
+ case "4":
+ invoiceStatus = "鍙栨秷鐢宠";
+ break;
+ }
+ otherInfo.put("invoiceStatus",invoiceInfo.get("InvoiceMakeout")+"-"+invoiceStatus);
+ }
+
+
+
data.put("orderInfo", orderInfo);
data.put("patientInfo", patientInfo);
data.put("serviceInfo", serviceInfo);
data.put("medicalInfo", medicalInfo); // 鏆傛椂涓虹┖
data.put("dispatchInfo", dispatchInfo); // 鏇存柊涓哄寘鍚汉鍛樹俊鎭殑dispatchInfo
data.put("paymentInfo", payInfoList); // 鏆傛椂涓虹┖
- data.put("operationInfo", new ArrayList<>()); // 鏆傛椂涓虹┖
+ data.put("otherInfo", otherInfo);
+
return AjaxResult.success(data);
}
--
Gitblit v1.9.1