feat(care): 新增死亡时间、死亡证明图片等字段并优化查询

- 在 CareApplications 模型中添加 scoreAssess 字段
- 更新 CareApplicationsMapper.xml，加入新的字段映射
- 修改 CareNurseClocksServiceImpl 中的查询逻辑

ruoyi-system/src/main/java/com/ruoyi/care/domain/CareApplications.java

@@ -87,6 +87,10 @@ public class CareApplications extends BaseEntity
 
     private Long companyUserId;
     private Long nurseUserId;
+
+    private String scoreAssess;
+
+
     public Long getCompanyUserId() {
         return companyUserId;
     }
@@ -368,4 +372,11 @@ public class CareApplications extends BaseEntity
     public Long getNurseUserId() {
         return nurseUserId;
     }
+    
+    public void setScoreAssess(String scoreAssess) {
+        this.scoreAssess = scoreAssess;
+    }
+    public String getScoreAssess() {
+        return scoreAssess;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/care/service/impl/CareNurseClocksServiceImpl.java

@@ -216,7 +216,7 @@ public class CareNurseClocksServiceImpl implements ICareNurseClocksService
 
         //获取最后一次打卡记录
         CareNurseClocks careNurseClock=careNurseClocksMapper.selectLastClock(careApplications.getApplyId());
-        CareNurseRecords careNurseRecord=careNurseRecordsMapper.selectCareNurseRecordsByNursingRecordId(careNurseClock.getNursingRecordId());
+        CareNurseRecords careNurseRecord=careNurseRecordsMapper.selectCareNurseRecordsByNursingRecordId(careNurseClock.getClockId());
         //计算计时天数
         try {
             careNurseRecord=calDayApplyRecord(careNurseRecord,careNurseClock.getNursingTime());

ruoyi-system/src/main/resources/mapper/care/CareApplicationsMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.address,
             a.care_days,
             a.apply_date,
-            a.STATUS,
+            a.STATUS status,
             a.deal_status,
             a.pay_status,
             a.audit_reason,
@@ -56,13 +56,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.update_time,
             a.remark,
             a.leave_time,
+            a.die_time,
+            a.die_img,
             s.assign_id assign_id,
             s.company_id,
             n.nurse_id,
             n.NAME nurse_name,
             h.`name` hospital_name,
             s.remark assign_remark,
-            p.disability
+            p.disability,
+            score.assess score_assess
         FROM
             care_applications a
                 left join care_persons p on p.person_id=a.person_id
@@ -71,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN care_hospital h ON h.hospital_id = a.hospital
                 LEFT JOIN sys_user u ON u.user_id = a.create_by
                 LEFT JOIN care_companies c ON c.company_id=s.company_id
+                LEFT JOIN care_scores score ON score.apply_id = a.apply_id
     </sql>
 
     <select id="selectCareApplicationsList" parameterType="CareApplications" resultMap="CareApplicationsResult">
@@ -181,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="leaveTime!=null">leave_time=#{leaveTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="dieImg != null">die_img = #{dieImg},</if>
+            <if test="dieTime != null">die_time = #{dieTime},</if>
+            <if test="finallyDays != null">finally_days = #{finallyDays},</if>
         </trim>
         where apply_id = #{applyId}
     </update>