diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseelder/api/INuBaseElderApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseelder/api/INuBaseElderApi.java index 32c30f4..69425f1 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseelder/api/INuBaseElderApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/nubaseelder/api/INuBaseElderApi.java @@ -8,7 +8,7 @@ import java.util.List; public interface INuBaseElderApi { - List queryByOpenId(String openId); + List queryByOpenId(String openId, String elderId); void bindnu(NuBaseInfoEntity nuBaseInfoEntity); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java index 1a2b2a5..c6a11d7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java @@ -12,6 +12,7 @@ import com.nu.modules.nubaseelder.entity.NuBaseElder; import com.nu.modules.nubaseelder.mapper.NuBaseElderMapper; import com.nu.modules.nubaseelder.service.INuBaseElderService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -59,7 +60,6 @@ public class NuBaseElderServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); @@ -71,9 +71,12 @@ public class NuBaseElderServiceImpl extends ServiceImpl queryByOpenId(String openId) { + public List queryByOpenId(String openId, String elderId) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("open_id", openId); + if (StringUtils.isNotBlank(elderId)) { + qw.eq("elder_id",elderId); + } List list = baseMapper.selectList(qw); return BeanUtil.copyToList(list, NuBaseElderEntity.class); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index 34a21ea..17741c3 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -104,7 +104,7 @@ public class ElderApi { advisoryInfoApi.editNuBizAdvisoryInfo(nuBizAdvisoryInfo); //通知对应机构修改老人家属信息 //护理单元信息 - List nuElderList = nuBaseElderApi.queryByOpenId(nuBizAdvisoryInfo.getOpenId()); + List nuElderList = nuBaseElderApi.queryByOpenId(nuBizAdvisoryInfo.getOpenId(), null); if (nuElderList != null && nuElderList.size() > 0) { //查询出机构编码 - 机构名称对应关系 List jsonObjects = sysBaseAPI.queryOpeDept(); @@ -216,10 +216,10 @@ public class ElderApi { * @return */ @GetMapping("/queryElders") - public Result> queryElders(@RequestParam("openId") String openId) { + public Result> queryElders(@RequestParam("openId") String openId, @RequestParam("elderId") String elderId) { //护理单元信息 - List nuElderList = nuBaseElderApi.queryByOpenId(openId); + List nuElderList = nuBaseElderApi.queryByOpenId(openId, elderId); if (nuElderList == null || nuElderList.size() == 0) { return Result.ok(List.of()); } @@ -249,7 +249,7 @@ public class ElderApi { String orgCode = entry.getKey(); //切换数据源整理好数据放到返回结果中 DynamicDataSourceContextHolder.push(orgCode); - List list = elderInfoApi.queryElders(openId); + List list = elderInfoApi.queryElders(openId, elderId); result.addAll(list); DynamicDataSourceContextHolder.clear(); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java index 5774da9..0a6d9ff 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java @@ -71,7 +71,7 @@ public class NuBaseInfoApi { @GetMapping("/queryBillList") public Result> queryBillList(@RequestParam("openId") String openId) { //护理单元信息 - List nuElderList = nuBaseElderApi.queryByOpenId(openId); + List nuElderList = nuBaseElderApi.queryByOpenId(openId, null); if (nuElderList == null || nuElderList.size() == 0) { return Result.ok(List.of()); } @@ -116,7 +116,7 @@ public class NuBaseInfoApi { @GetMapping("/elderHomeList") public Result> elderHomeList(@RequestParam("openId") String openId) { //护理单元信息 - List nuElderList = nuBaseElderApi.queryByOpenId(openId); + List nuElderList = nuBaseElderApi.queryByOpenId(openId, null); if (nuElderList == null || nuElderList.size() == 0) { return Result.ok(List.of()); } diff --git a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java index a6d55e1..824ed73 100644 --- a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java +++ b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java @@ -8,5 +8,5 @@ public interface IElderInfoApi { List queryByElderIds(String[] split); - List queryElders(String openId); + List queryElders(String openId, String elderId); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index 483682e..4b40b57 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.elderinfo.entity.ElderInfo; import com.nu.modules.elderinfo.mapper.ElderInfoMapper; import com.nu.modules.elderinfo.service.IElderInfoService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,15 +30,18 @@ public class ElderInfoServiceImpl extends ServiceImpl queryByElderIds(String[] ids) { QueryWrapper qw = new QueryWrapper<>(); qw.in("id", ids); - return BeanUtil.copyToList(baseMapper.selectList(qw),ElderInfoEntity.class); + return BeanUtil.copyToList(baseMapper.selectList(qw), ElderInfoEntity.class); } @Override - public List queryElders(String openId) { + public List queryElders(String openId, String elderId) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("guardian_open_id",openId); + qw.eq("guardian_open_id", openId); + if(StringUtils.isNotBlank(elderId)){ + qw.eq("id",elderId); + } List elderInfos = baseMapper.selectList(qw); - return BeanUtil.copyToList(elderInfos,ElderInfoEntity.class); + return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class); } }