指派给志愿者，查询的是居民信息里的志愿者信息

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java

@@ -47,11 +47,13 @@ public interface UserDemandConstant {
     String EVALUATE="evaluate";
 
 //    服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+
+    //volunteer是指的居民信息的志愿者
     String VOLUNTEER="volunteer";
     String SOCIAL_ORG="social_org";
     String COMMUNITY_ORG="community_org";
     String PARTY_UNIT="party_unit";
-
+    String EPMET_USER_VOLUNTEER="epmet_user_volunteer";
 
     /**
      * 个人档案：personal-data

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -430,6 +430,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 serviceName=null != dto ? dto.getOrganizationName() : StrConstant.EPMETY_STR;
                 break;
             case UserDemandConstant.VOLUNTEER:
+                Result<IcResiUserDTO> icUserInfoRes = epmetUserOpenFeignClient.getIcResiUserDTO(serverId);
+                if (!icUserInfoRes.success() || null!=icUserInfoRes.getData()) {
+                    throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常","查询居民信息志愿者信息异常");
+                }
+                serviceName=icUserInfoRes.getData().getName();
+                break;
+            case UserDemandConstant.EPMET_USER_VOLUNTEER:
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(serverId));
                 if (!userInfoRes.success() || CollectionUtils.isEmpty(userInfoRes.getData())) {
                     throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询志愿者信息异常","志愿者信息查询异常");
@@ -1103,7 +1110,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
         //3、插入或更新服务记录
         IcUserDemandServiceEntity origin=demandServiceDao.selectByRecId(formDTO.getDemandRecId());
-        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.VOLUNTEER);
+        String serviceName=queryServiceName(formDTO.getUserId(),UserDemandConstant.EPMET_USER_VOLUNTEER);
         if (StringUtils.isBlank(serviceName)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务方名称获取异常", "服务方名称异常");
         }