wzp
2025-05-22 e961d2daa7f0fab9257ec411491cb23ab8a6c919
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
@@ -91,10 +91,14 @@
     * 根据服务订单编号获取详细信息
     */
    @Anonymous
    @Anonymous(needSign = true)
    @GetMapping(value = "/{serviceOrdId}")
    public AjaxResult getInfo(@PathVariable Long serviceOrdId) {
        TbOrders orderDetail = tbOrdersService.selectTbOrdersByOrderID(serviceOrdId);
        if(orderDetail==null){
            return AjaxResult.error("订单不存在");
        }
        //查询服务单
        ServiceOrder mingServiceOrder = serviceOrderService.selectServiceOrderById(Long.valueOf(orderDetail.getServiceOrdID()));
@@ -260,9 +264,16 @@
        medicalInfo.put("useVentilator", useVentilator);
        //支付信息
//        List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //正式使用
        List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");//测试使用
        List<PayInfo> payInfoList = new ArrayList<>();
        if(serviceOrdId==88801)
        {
            //测试数据
            payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");//测试使用
        }
        else{
            payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //正式使用
        }
        //其他信息
        Map<String, Object> otherInfo = new HashMap<>();
@@ -270,14 +281,32 @@
        otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "-"));
        //知情同意书
        // List<String> imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID());  //正式使用
        List<String> imageUrls = new ArrayList<>();//测试使用
        imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3VhEv_VVql2K6eM9tS9uXgKv8fm7vaKtrSFCiP0SraTgz2qe1isgvIuUrqSNv-XgEvdC5kFUxeyrn_wz8Mfc2Sg.jpg");
        imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3cDOPpqc_fzEJ-dHz8lq5aIx3tsnmEtossC6F5VCi2vj6sBwkuzOx4g1RcsWnQ3XNua7COADksYI1rHnbizccOw.jpg");
        otherInfo.put("imageUrls", imageUrls);
        if(serviceOrdId==88801)
        {
            //测试数据
            imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3VhEv_VVql2K6eM9tS9uXgKv8fm7vaKtrSFCiP0SraTgz2qe1isgvIuUrqSNv-XgEvdC5kFUxeyrn_wz8Mfc2Sg.jpg");
            imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3cDOPpqc_fzEJ-dHz8lq5aIx3tsnmEtossC6F5VCi2vj6sBwkuzOx4g1RcsWnQ3XNua7COADksYI1rHnbizccOw.jpg");
            otherInfo.put("imageUrls", imageUrls);
        }
        else{
            imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID());  //正式使用
            otherInfo.put("imageUrls", imageUrls);
        }
        //发票获取
        Map<String, Object> invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
        Map<String, Object> invoiceInfo = new HashMap<>();
        if(serviceOrdId==88801)
        {
            //测试数据
            invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
        }
        else{
            invoiceInfo = payInfoService.selectLatestInvoiceInfo(orderDetail.getServiceOrdID()); //正式使用
        }
        String invoiceStatus = "";
        if (invoiceInfo != null && invoiceInfo.get("AuditStatus") != null) {
            switch (String.valueOf(invoiceInfo.get("AuditStatus"))) {