From 3c05712b9cf32913909d8711fb8cc6c270c0e61e Mon Sep 17 00:00:00 2001
From: skjia <106962133@qq.com>
Date: Fri, 18 Jul 2025 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../health/service/impl/HealthPersonInfoServiceImpl.java    | 4 +++-
 .../main/resources/mapper/health/HealthPersonInfoMapper.xml | 6 ++++--
 .../mapper/health/HealthPersonMedicalReportMapper.xml       | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java
index cc25e21..e4e4538 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java
@@ -37,7 +37,9 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
     @Override
     public HealthPersonInfo selectHealthPersonInfoById(Long id) {
         HealthPersonInfo vo=healthPersonInfoMapper.selectHealthPersonInfoById(id);
-                vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile()==null?"":vo.getMobile()));
+                if(vo!=null){
+                    vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile()==null?"":vo.getMobile()));
+                }
                 return vo;
 
     }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml
index b1d8485..e7fd05b 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="orgFullName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectHealthPersonInfoVo">
@@ -135,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                c.heart_rate,
                c.blood_oxygen,
                c.uric_acid,
-               c.blood_pressure,
+               c.blood_pressure,sd.dept_name,
                GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names,
                GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc)   AS chronic_ids
         from sys_user a
@@ -143,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join health_person_body_record c on a.user_id = c.user_id and c.if_latest = 1
                  left join health_person_info_chronic d on a.user_id = d.user_id
                  left join health_chronic hc on d.chronic_id=hc.chronic_id
+                 left join sys_dept sd on a.dept_id = sd.dept_id
         where a.user_id = #{userId} and hc.chronic_id is not null
         group by a.user_id,
                  a.user_name,
@@ -177,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  c.heart_rate,
                  c.blood_oxygen,
                  c.uric_acid,
-                 c.blood_pressure
+                 c.blood_pressure,sd.dept_id
     </select>
 
     <insert id="insertHealthPersonInfo" parameterType="com.bonus.canteen.core.health.domain.HealthPersonInfo">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml
index d82c62c..3b2a956 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml
@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalMechanism != null  and medicalMechanism != ''"> and medical_mechanism = #{medicalMechanism}</if>
             <if test="medicalTemplateId != null "> and medical_template_id = #{medicalTemplateId}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectHealthPersonMedicalReportById" parameterType="Long" resultMap="HealthPersonMedicalReportResult">