修改

1、长者安全情况联调修改
BUGFIX
1、解决南沙院护理变更，变更一次记录出现多条的问题。
2、解决南沙院护理变更点击详情报错的问题

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/excel/ElderlyBaseInfoExportExcelVO.java

@@ -90,6 +90,9 @@ public class ElderlyBaseInfoExportExcelVO {
     @DictFormat(DictTypeConstants.LIVE_ARR)
     private String liveSituation;
 
+    @ExcelProperty("户籍地址")
+    private String registeredResidenceAddress;
+
     @ExcelProperty("居住地址")
     private String address;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/elderly/ElderlySafeCheckController.java

@@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -33,6 +34,7 @@ public class ElderlySafeCheckController {
 
     @PostMapping("/create")
     @Operation(summary = "创建长者安全检查")
+    @PermitAll
     public CommonResult<Integer> create(@Valid @RequestBody List<ElderlySafeCheckSaveReqVO> createReqList) {
         for (ElderlySafeCheckSaveReqVO createReqVO : createReqList) {
             createReqVO.setTenantId(Objects.isNull(createReqVO.getTenantId())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/elderly/vo/ElderlySafeCheckSaveReqVO.java

@@ -36,5 +36,8 @@ public class ElderlySafeCheckSaveReqVO {
 
     @Schema(description = "机构id", example = "1")
     private Long tenantId;
+
+    @Schema(description = "记录人", example = "1")
+    private String recorder;
 }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/elderly/ElderlySafeCheckDO.java

@@ -45,5 +45,8 @@ public class ElderlySafeCheckDO extends BaseNoDeleteDO {
 
     /** 机构id */
     private Long tenantId;
+
+    /** 记录人*/
+    private String recorder;
 }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/elderly/ElderlySafeCheckMapper.java

@@ -38,6 +38,8 @@ public interface ElderlySafeCheckMapper extends BaseMapperX<ElderlySafeCheckDO>
             "  ei.bed_name AS bedName",
             "FROM elderly_safe_check esc",
             "LEFT JOIN elderly_info ei ON ei.id = esc.elder_id",
+            "LEFT JOIN org_build_room r ON ei.room_id = r.id",
+            "LEFT JOIN org_build_bed b ON ei.bed_id = b.id",
             "WHERE 1 = 1",
             "  <if test='pageVO.elderId != null'>",
             "    AND esc.elder_id = #{pageVO.elderId}",

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/elderly/ElderlySafeCheckServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.elderly;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.system.controller.admin.elderly.vo.ElderlySafeCheckElderPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.elderly.vo.ElderlySafeCheckElderPageRespVO;
@@ -111,7 +112,7 @@ public class ElderlySafeCheckServiceImpl implements ElderlySafeCheckService {
 
         PageResult<ElderlySafeCheckDO> pageResult = safeCheckMapper.selectRecordPage(pageReqVO, startTime, endTimeExclusive);
         List<ElderlySafeCheckRespVO> list = BeanUtils.toBean(pageResult.getList(), ElderlySafeCheckRespVO.class);
-        fillElderInfo(list);
+//        fillElderInfo(list);
         return new PageResult<>(list, pageResult.getTotal());
     }
 

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

@@ -288,7 +288,7 @@
     <select id="selectNurseListPage" resultType="cn.iocoder.yudao.module.system.api.bpm.vo.NurseChangeRecordRespVO">
         SELECT
             ecr.id,
-            eei.item_name AS originalItemName,
+            ecr.original_name AS originalItemName,
             soc.charge_name,
             ei.id AS elderlyId,
             ei.elder_name AS elderlyName,
@@ -306,14 +306,10 @@
             bbf.process_instance_id
         FROM elderly_change_record ecr
         INNER JOIN elderly_info ei ON ecr.elderly_id = ei.id
-        INNER JOIN elderly_expense ee ON ei.id = ee.elder_id
-        INNER JOIN elderly_expense_item eei ON eei.expense_id = ee.id
-        INNER JOIN sys_charge_category scc ON scc.id = eei.item_category_id AND scc.identification = 2
         INNER JOIN sys_overhead_charge soc ON soc.id = ecr.overhead_charge_id
         INNER JOIN bpm_business_form bbf ON ecr.id = bbf.business_id
         INNER JOIN system_tenant st ON st.id = ei.tenant_id
         WHERE ecr.current_flag = 0
-        AND ee.created_time = (SELECT MAX(ee2.created_time) FROM elderly_expense ee2 WHERE ee2.elder_id = ei.id)
         <if test="pageVO.expectName != null">
             AND ecr.expect_name LIKE CONCAT('%', #{pageVO.expectName}, '%')
         </if>
@@ -560,13 +556,12 @@
                  INNER JOIN bpm_business_form bbf ON bbf.business_id = ecr.id AND bbf.type = 5
                  INNER JOIN elderly_info ei ON ecr.elderly_id = ei.id
                  INNER JOIN elderly_expense ee ON ei.id = ee.elder_id
-                 INNER JOIN elderly_expense_item eei ON eei.expense_id = ee.id
+                 INNER JOIN elderly_expense_item eei ON eei.expense_id = ee.id AND eei.item_id = ecr.overhead_charge_id
                  INNER JOIN sys_charge_category scc ON scc.id = eei.item_category_id AND scc.identification = 2
                  INNER JOIN sys_overhead_charge soc ON soc.id = ecr.overhead_charge_id
                  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)
     </select>
 
     <select id="createNurseChangeGetDetail" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.NurseChangeDetailRespVO">

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyInfoMapper.xml

@@ -69,6 +69,7 @@
         <result column="file_number" jdbcType="VARCHAR" property="fileNumber"/>
         <result column="source_type" jdbcType="INTEGER" property="sourceType"/>
         <result column="in_status_type" jdbcType="INTEGER" property="inStatusType"/>
+        <result column="registered_residence_address" jdbcType="VARCHAR" property="registeredResidenceAddress"/>
     </resultMap>
     <select id="findPage" resultType="cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyInfoDO">
         select ei.*, ec.contract_number as contractNumber

yudao-server/src/main/resources/application.yaml

@@ -3,8 +3,8 @@ spring:
     name: yudao-server
 
   profiles:
-    active: test
-#    active: dev
+#    active: test
+    active: dev
 
 
   main:
@@ -246,6 +246,7 @@ yudao:
       - /admin-api/elderly-nursing-log/executeNursingLog
       - /admin-api/elderly/nursingPlan/getLowFrequencyPlanItemsByFloorId
       - /admin-api/elderly-items-round/batch-create
+      - /admin-api/elderly-safe-check/create
 #      - /admin-api/bpm/check-in-wait/create
     ignore-tables:
       - system_tenant