From f8841e5a1132c8921babdf46d4b66334c1514eca Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 26 二月 2025 15:44:58 +0800
Subject: [PATCH] 修改小程序获取信息接口

---
 ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java  |    2 +-
 ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml                    |    8 +++++---
 ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java |    3 ++-
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java          |    2 +-
 ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java       |    3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index d402a70..ab252d4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -17,6 +17,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -69,7 +70,7 @@
         JSONObject entries = JSONUtil.parseObj(json);
         String card = entries.getStr("card");
 //        TjCustomer customer = tjCustomerMapper.getCusInfo(card);
-        List<TjCustomer> customer = tjCustomerMapper.getCusInfoList(card);
+        List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card);
         return AjaxResult.success(customer);
     }
 
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index 417cd73..df1ee6d 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -117,7 +117,7 @@
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 // 涓夋柟鍙皟鐢ㄦ帴鍙�
-                .antMatchers("/api/viewReport","/api/reportData").permitAll()
+                .antMatchers("/api/viewReport","/api/reportData","/api/getInfo").permitAll()
                 .antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous()
                 // 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
                 .anyRequest().authenticated()
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
index c25965c..78e0fb2 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -35,7 +35,8 @@
                         "/lis/**","/api/His/**","/pacs/**",
                         "/callBack/**",
                         "/api/viewReport",
-                        "/api/reportData"
+                        "/api/reportData",
+                        "/api/getInfo"
                 });
 
         registry.addInterceptor(dbChangeInterceptor)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index 9907aa3..1127618 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -107,5 +107,5 @@
 
     TjCustomer getCusInfo(@Param("card") String card);
 
-    List<TjCustomer> getCusInfoList(String card);
+    List<Map<String ,Object >> getCusInfoList(String card);
 }
diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
index 7af046b..7892bcc 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml
@@ -280,7 +280,7 @@
   o.create_time DESC
 LIMIT 1
     </select>
-    <select id="getCusInfoList" resultType="com.ltkj.hosp.domain.TjCustomer">
+    <select id="getCusInfoList" resultType="java.util.Map">
         SELECT
             c.cus_name as name,
             c.cus_idcard as card,
@@ -292,17 +292,19 @@
             c.cus_brithday as csrq,
             o.tj_number as tjNum,
             c.cus_phone as phone,
-            o.create_time as time,
+            DATE_FORMAT(o.create_time, '%Y-%m-%d %H:%i:%s') as time,
   TIMESTAMPDIFF(YEAR, c.cus_brithday, CURDATE()) -
     CASE
       WHEN MONTH(c.cus_brithday) > MONTH(CURDATE())
         OR (MONTH(c.cus_brithday) = MONTH(CURDATE()) AND DAY(c.cus_brithday) > DAY(CURDATE()))
       THEN 1
       ELSE 0
-        END AS age
+        END AS age,
+      CASE WHEN r.re_id IS NOT NULL THEN 1 ELSE 0 END AS type
 FROM
   tj_order o
   JOIN tj_customer c ON o.user_id = c.cus_id
+  LEFT JOIN tj_report r ON o.tj_number = r.tj_number
 WHERE
   c.cus_idcard = #{card}
         ORDER BY

--
Gitblit v1.8.0