From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 25736a2..5d27952 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
@@ -99,7 +99,7 @@
     @GetMapping(value = "/getInfoById")
     @ApiOperation(value = "鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅")
     public AjaxResult getInfoById(@RequestParam String tjNumber) {
-        if (null != tjNumber && !"".equals(tjNumber)) {
+        if (null != tjNumber && !tjNumber.isEmpty()) {
 //            LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
 //            wq.eq(TjAskMedicalHistory::getTjNum, tjNumber);
 //            TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq);
@@ -126,7 +126,8 @@
                 wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
                 final List<TjAskHistorys> list11 = historysService.list(wqq111);
                 one.setTjAskHistorysList(list11);
-
+                TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+                one.setTjLx(order.getTjCategory());
                 return AjaxResult.success(one);
             }else {
                 TjAskMedicalHistory a = new TjAskMedicalHistory();
@@ -138,7 +139,7 @@
                 a.setTjLx(order.getTjCategory());
                 TjCustomer customer = customerService.getById(a.getCusId());
                 if (customer != null) {
-                    a.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+                    a.setCusName(customer.getCusName());
                     a.setCusIdCard(customer.getCusIdcard());
                     a.setCusSex(String.valueOf(customer.getCusSex()));
                 }
@@ -250,7 +251,7 @@
                     }
                 }
             }
-            return AjaxResult.success();
+            return AjaxResult.success(tjAskMedicalHistory);
         }
         return AjaxResult.error();
         //return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));

--
Gitblit v1.8.0