Fix Bug #491: 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常

根因分析：
1. organizationLocationInit() 中 Organization.getName() 未做空值过滤，若数据库存在name为null的科室记录会NPE
2. addOrEditOrgLoc() 中 activityDefinitionMapper.selectById().getName() 未对selectById返回null做防护
3. addOrEditOrgLoc() 缺少organizationId前置校验，空值传入可能导致后续流程异常

修复内容：
- 第74行：stream中增加 .filter(organization -> organization != null && organization.getName() != null)
- 第136-138行：增加organizationId为null时的校验，返回友好错误提示
- 第145-147行：将activityDefinitionMapper.selectById结果先赋值再判空，避免NPE

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java

@@ -7,6 +7,7 @@ import com.core.common.utils.MessageUtils;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.domain.OrganizationLocation;
+import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.administration.mapper.OrganizationLocationMapper;
 import com.openhis.administration.service.ILocationService;
 import com.openhis.administration.service.IOrganizationLocationService;
@@ -70,6 +71,7 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
         // 获取科室下拉选列表
         List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
         List<OrgLocInitDto.departmentOption> organizationOptions = organizationList.stream()
+            .filter(organization -> organization != null && organization.getName() != null)
             .map(organization -> new OrgLocInitDto.departmentOption(organization.getId(), organization.getName()))
             .collect(Collectors.toList());
         initDto.setLocationFormOptions(chargeItemStatusOptions).setDepartmentOptions(organizationOptions);
@@ -131,12 +133,18 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
     @Override
     public R<?> addOrEditOrgLoc(OrgLocQueryDto orgLocQueryDto) {
 
+        // Validate required fields before processing
+        if (orgLocQueryDto.getOrganizationId() == null) {
+            return R.fail("请选择执行科室");
+        }
+
         OrganizationLocation orgLoc = new OrganizationLocation();
         BeanUtils.copyProperties(orgLocQueryDto, orgLoc);
 
         Long activityDefinitionId = orgLoc.getActivityDefinitionId();
-        String activityName = activityDefinitionId != null
+        ActivityDefinition activityDef = activityDefinitionId != null
-            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
+            ? activityDefinitionMapper.selectById(activityDefinitionId) : null;
+        String activityName = activityDef != null ? activityDef.getName() : "";
 
         List<OrganizationLocation> organizationLocationList =
             organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());