diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
index 8358fa85..95599294 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
@@ -268,7 +268,7 @@
         </choose>
         <choose>
             <when test="objLocationId != null and objLocationId != ''">
-                AND T1.location_id IN (#{orgLocationId})
+                AND T1.location_id IN (#{orgLocationId}, #{objLocationId})
             </when>
             <otherwise>
                 AND T1.location_id = #{orgLocationId}
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
index 92fc19e8..4890f23e 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -646,6 +646,11 @@ async function submitForm() {
     treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != ''
       ? JSON.stringify(treatmentItems.value)
       : undefined;
+  // Bug #464 修复：零售价自动与诊疗子项合计总价同步
+  // 当有子项时，零售价自动设置为子项合计总价
+  if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '') {
+    form.value.retailPrice = parseFloat(totalPrice.value) || 0;
+  }
   proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => {
     if (valid) {
       // 医保编码唯一性校验