数据库更新

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -262,8 +262,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
         List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
 
 
-        treeList.forEach(e->{
-            if(StringUtils.isBlank(e.getParentId())){
+        treeList.forEach(e -> {
+            if (StringUtils.isBlank(e.getParentId())) {
                 e.setParentId(TreeConst.TOP_LEVEL);
                 e.setParentId(TreeConst.TOP_LEVEL);
             }
             }
         });
         });
@@ -579,6 +579,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         platElder.setStreetOrgId(userVO.getStreetOrgId());
         platElder.setStreetOrgId(userVO.getStreetOrgId());
         platElder.setOrgPath(userVO.getOrgPath());
         platElder.setOrgPath(userVO.getOrgPath());
 
 
+        if (StringUtils.isNotBlank(dto.getBedId())) {
+            platElder.setCheckInTime(LocalDateTime.now());
+        }
+
         save(platElder);
         save(platElder);
 
 
         dto.setId(platElder.getId());
         dto.setId(platElder.getId());
@@ -627,7 +631,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         personalConfigCacheUtil.put(healthInfo);
         personalConfigCacheUtil.put(healthInfo);
 
 
 
 
-
         PlatElderOtherInfo otherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda()
         PlatElderOtherInfo otherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda()
                 .eq(PlatElderOtherInfo::getElderId, dto.getId()));
                 .eq(PlatElderOtherInfo::getElderId, dto.getId()));
         if (otherInfo == null) {
         if (otherInfo == null) {
@@ -658,7 +661,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         fillSpace(platElder);
         fillSpace(platElder);
 
 
-        if (StringUtils.isNotBlank(dto.getBedId())) {
+        if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
             platElder.setCheckInTime(LocalDateTime.now());
             platElder.setCheckInTime(LocalDateTime.now());
         }
         }
 
 
@@ -666,7 +669,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         addOrEditExt(dto);
         addOrEditExt(dto);
 
 
-        if (StringUtils.isNotBlank(dto.getBedId())) {
+        if (StringUtils.isNotBlank(dto.getBedId()) && !dto.getBedId().equals(oldBedId)) {
             db.setCheckInTime(LocalDateTime.now());
             db.setCheckInTime(LocalDateTime.now());
             checkInInternal(dto.getBedId());
             checkInInternal(dto.getBedId());
         }
         }
@@ -675,8 +678,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         }
         }
 
 
 
 
-
-
     }
     }
 
 
     //@TenantIdIgnore
     //@TenantIdIgnore