二期 频安宝bug

src/main/java/com/care/client/service/PinanbaoContactService.java

@@ -27,12 +27,12 @@ import java.util.List;
 @Slf4j
 @Service
 public class PinanbaoContactService {
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
+
     @Resource
     private CareHouseContactService careHouseContactService;
 
-
+    @Resource
+    private CareHouseContactRelService careHouseContactRelService;
     /**
      * 查询紧急联系人
      * @param memberId
@@ -102,6 +102,10 @@ public class PinanbaoContactService {
      * @return
      */
     public boolean deleteById(Long id){
+        QueryWrapper<CareHouseContactRel> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareHouseContactRel::getContactId,id);
+        careHouseContactRelService.remove(queryWrapper);
+
         return this.careHouseContactService.removeById(id);
     }
 

src/main/java/com/care/client/service/PinanbaoOlderService.java

@@ -26,11 +26,11 @@ import java.util.List;
 @Service
 public class PinanbaoOlderService {
 
-    @Resource
-    private CareMemberInfoService careMemberInfoService;
+
     @Resource
     private CareOlderService careOlderService;
-
+    @Resource
+    private CareHouseOlderRelService careHouseOlderRelService;
     /**
      * 查询老人
      * @param memberId
@@ -38,9 +38,8 @@ public class PinanbaoOlderService {
      */
     public List<OlderVO> queryOlderByMemberId(Long memberId){
         List<OlderVO> vos = Lists.newArrayList();
-        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
         QueryWrapper<CareOlder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareOlder::getMemberId, memberInfo.getId());
+        queryWrapper.lambda().eq(CareOlder::getMemberId, memberId);
         List<CareOlder> olders = this.careOlderService.list(queryWrapper);
         if (CollUtil.isNotEmpty(olders)){
             olders.forEach(item -> {
@@ -100,6 +99,10 @@ public class PinanbaoOlderService {
      * @return
      */
     public boolean deleteById(Long id){
+        QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareHouseOlderRel::getOlderId,id);
+        careHouseOlderRelService.remove(queryWrapper);
+
         return this.careOlderService.removeById(id);
     }
 }