Просмотр исходного кода

BUGFIX
1、解决护理变更续约后详情接口报错问题

liangwenxuan 3 недель назад
Родитель
Сommit
5c07f3aa97

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyChangeRecordMapper.java

@@ -91,7 +91,7 @@ public interface ElderlyChangeRecordMapper extends BaseMapperX<ElderlyChangeReco
 
     List<NurseChangeyEvaluationRespVO> getEvaluationByElderId(Long elderId);
 
-    NurseChangeDetailRespVO getNurseDetail(Long id);
+    List<NurseChangeDetailRespVO> getNurseDetail(Long id);
     NurseChangeDetailRespVO createNurseChangeGetDetail(Long id);
 
     CateringChangeDetailRespVO getCateringDetail(Long id);

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/NurseChangeRecordServiceImpl.java

@@ -235,7 +235,7 @@ public class NurseChangeRecordServiceImpl implements ElderlyChangeRecordService
     @Override
     @TenantIgnore
     public NurseChangeDetailRespVO getNurseDetail(Long id, Boolean isDetail) {
-        NurseChangeDetailRespVO detail = isDetail ? bedChangeRecordMapper.getNurseDetail(id) : bedChangeRecordMapper.createNurseChangeGetDetail(id);
+        NurseChangeDetailRespVO detail = isDetail ? bedChangeRecordMapper.getNurseDetail(id).get(0) : bedChangeRecordMapper.createNurseChangeGetDetail(id);
         detail.setBedName(buildService.getFullBedName(detail.getElderlyId()));
         return detail;
     }

+ 3 - 1
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyChangeRecordMapper.xml

@@ -562,7 +562,9 @@
                  LEFT JOIN sys_evaluation_process sep ON ecr.associate_id = sep.id
                  LEFT JOIN elderly_synthetic_ability esa ON sep.id = esa.questionnaire_id AND esa.elder_id = ei.id
         WHERE ecr.current_flag = 0 AND ecr.id = #{id}
-            AND ee.created_time = (SELECT MAX(ee2.created_time) FROM elderly_expense ee2 WHERE ee2.elder_id = ei.id)
+            <!--tips:添加该过滤条件如果该流程之后存在新的变更或者续约了,那么会报错。不添加该过滤条件的问题???-->
+<!--            AND ee.created_time = (SELECT MAX(ee2.created_time) FROM elderly_expense ee2 WHERE ee2.elder_id = ei.id)-->
+        order by ee.created_time
     </select>
 
     <select id="createNurseChangeGetDetail" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.NurseChangeDetailRespVO">