diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
index 5f9d1f50..d9ab38c8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
+++ b/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() + "时间冲突");
                 }
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
index 6c1fe949..0a5e7f14 100755
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -1818,13 +1818,6 @@ function handleQuoteBilling() {
               temporaryBillingMedicines.value = []
               temporaryAdvices.value = []
     
-<<<<<<< HEAD
-              // 🔧 修复 Bug #445: 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3/6)
-              // 同时过滤掉已有 requestId 的项目（已生成医嘱的不需要再次显示在"待生成"列表中）
-              // 先提取已签发项目(statusEnum=2)填充已生成列表
-              const activeItems = res.data.filter(item => {
-                if (item.encounterId !== temporaryPatientInfo.value.visitId) return false;
-=======
               // 🔧 修复 Bug #444: 统一过滤逻辑，与 handleMedicalAdvice 保持一致
               // 1. 使用 Number() + snake_case 回退，避免类型转换导致过滤失效
               // 2. 增加关键词二次过滤，排除手术/检查/诊疗等非药品项目
@@ -1833,7 +1826,6 @@ function handleQuoteBilling() {
                 if (item.encounterId !== temporaryPatientInfo.value.visitId) return false;
                 // 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3/6)
                 // 🔧 修复 Bug #444: 使用 Number() 显式转换，增加 snake_case 回退
->>>>>>> origin/guanyu
                 const at = Number(item.adviceType ?? item.advice_type);
                 if (at !== 1 && at !== 2) return false;
                 if (item.statusEnum !== 2) return false;