Fix Bug #547: 合并冲突解决 — 保留 HEAD 版本的软删除科室跳过逻辑（continue），合并远程的手术安排时间字段回显修复

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

@@ -169,13 +169,9 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
                     Organization org = organizationService.getById(organizationLocation.getOrganizationId());
-<<<<<<< HEAD
                     if (org == null) {
                         continue;
                     }
-=======
-                    String organizationName = org != null ? org.getName() : ("科室[" + organizationLocation.getOrganizationId() + "]已删除");
->>>>>>> origin/guanyu
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
                         + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + org.getName() + "时间冲突");
                 }