Fix Bug #464: [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步

根本原因: calculateTotalPrice() 中同步零售价的条件只检查了第一个子项 (treatmentItems.value[0])，当第一个子项被清空但其他子项有效时，零售价不会同步。submitForm() 中存在相同问题。

修复内容:
1. calculateTotalPrice(): 使用 Array.some() 检查是否有任何有效子项，而非只检查第一个
2. 当无有效子项时，将 retailPrice 重置为 undefined 避免残留旧值
3. submitForm(): childrenJson 序列化和零售价同步同样改用 some() 检查
4. addItem(): 补充缺失的 name 字段，与初始值结构保持一致

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,7 +7,6 @@ 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;
@@ -71,7 +70,6 @@ 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);
@@ -133,18 +131,12 @@ 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();
-        ActivityDefinition activityDef = activityDefinitionId != null
-            ? activityDefinitionMapper.selectById(activityDefinitionId) : null;
-        String activityName = activityDef != null ? activityDef.getName() : "";
+        String activityName = activityDefinitionId != null
+            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
 
         List<OrganizationLocation> organizationLocationList =
             organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java

@@ -43,19 +43,6 @@ public interface IRequestFormManageAppService {
      */
     List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate);
 
-    /**
-     * 查询申请单（支持筛选+状态+关键字）
-     *
-     * @param encounterId 就诊id
-     * @param typeCode 申请单类型
-     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
-     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/项目名称模糊匹配）
-     * @return 申请单列表
-     */
-    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword);
-
     /**
      * 分页查询申请单
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java

@@ -341,28 +341,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                 .collect(Collectors.toList());
 
-        // 防重复保存：对新增医嘱进行去重，避免签发单条长期医嘱时产生重复记录
-        Set<String> longUniqueKeySet = new HashSet<>();
-        List<RegAdviceSaveDto> longUniqueList = new ArrayList<>();
-        for (RegAdviceSaveDto adviceSaveDto : longInsertOrUpdateList) {
-            String uniqueKey = adviceSaveDto.getPatientId() + "_"
-                    + adviceSaveDto.getEncounterId() + "_"
-                    + adviceSaveDto.getAdviceDefinitionId() + "_"
-                    + adviceSaveDto.getDose() + "_"
-                    + adviceSaveDto.getMethodCode() + "_"
-                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && longUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复长期医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
-                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
-                continue;
-            }
-            longUniqueKeySet.add(uniqueKey);
-            longUniqueList.add(adviceSaveDto);
-        }
-        log.info("防重复保存（长期）：去重前{}条，去重后{}条", longInsertOrUpdateList.size(), longUniqueList.size());
-        longInsertOrUpdateList = longUniqueList;
-
         for (RegAdviceSaveDto regAdviceSaveDto : longInsertOrUpdateList) {
             boolean firstTimeSave = false;// 第一次保存
             longMedicationRequest = new MedicationRequest();
@@ -428,29 +406,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 .getValue().equals(e.getTherapyEnum())
                 && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                 .collect(Collectors.toList());
-
-        // 防重复保存：对新增医嘱进行去重
-        Set<String> tempUniqueKeySet = new HashSet<>();
-        List<RegAdviceSaveDto> tempUniqueList = new ArrayList<>();
-        for (RegAdviceSaveDto adviceSaveDto : tempInsertOrUpdateList) {
-            String uniqueKey = adviceSaveDto.getPatientId() + "_"
-                    + adviceSaveDto.getEncounterId() + "_"
-                    + adviceSaveDto.getAdviceDefinitionId() + "_"
-                    + adviceSaveDto.getDose() + "_"
-                    + adviceSaveDto.getMethodCode() + "_"
-                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && tempUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复临时医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
-                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
-                continue;
-            }
-            tempUniqueKeySet.add(uniqueKey);
-            tempUniqueList.add(adviceSaveDto);
-        }
-        log.info("防重复保存（临时）：去重前{}条，去重后{}条", tempInsertOrUpdateList.size(), tempUniqueList.size());
-        tempInsertOrUpdateList = tempUniqueList;
-
         for (RegAdviceSaveDto regAdviceSaveDto : tempInsertOrUpdateList) {
             boolean firstTimeSave = false;// 第一次保存
             tempMedicationRequest = new MedicationRequest();

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -162,15 +162,11 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
             serviceRequest.setEncounterId(encounterId); // 就诊id
             serviceRequest.setAuthoredTime(curDate); // 请求签发时间
 
-            // 优先使用前端传来的 positionId（用户手动选择的发往科室），未传时从配置表查找
-            Long positionId = activitySaveDto.getPositionId();
+            Long positionId = activityOrganizationConfig.stream()
+                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
             if (positionId == null) {
-                positionId = activityOrganizationConfig.stream()
-                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
-                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (positionId == null) {
-                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
-                }
+                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
             }
             serviceRequest.setOrgId(positionId); // 执行科室
 
@@ -432,28 +428,12 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
      */
     @Override
     public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate) {
-        return getRequestForm(encounterId, typeCode, startDate, endDate, null, null);
-    }
-
-    /**
-     * 查询申请单（支持筛选+状态+关键字）
-     *
-     * @param encounterId 就诊id
-     * @param typeCode 申请单类型
-     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
-     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/项目名称模糊匹配）
-     * @return 申请单列表
-     */
-    @Override
-    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword) {
         // 检查参数
         if (encounterId == null) {
             return new java.util.ArrayList<>();
         }
 
-        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate,null,null);
         for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
             // 查询处方详情
             List<RequestFormDetailQueryDto> requestFormDetail =

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -98,7 +98,6 @@ public class RequestFormManageController {
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/检验项目模糊匹配）
      * @return 检验申请单
      */
     @GetMapping(value = "/get-inspection")
@@ -106,12 +105,11 @@ public class RequestFormManageController {
             @RequestParam(required = false) Long encounterId,
             @RequestParam(required = false) String startDate,
             @RequestParam(required = false) String endDate,
-            @RequestParam(required = false) String status,
-            @RequestParam(required = false) String keyword) {
+            @RequestParam(required = false) String status) {
         if (encounterId == null) {
             return R.fail("就诊ID不能为空");
         }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status, keyword));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate));
     }
 
     /**

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml

@@ -100,7 +100,6 @@
                    WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                    WHEN T1.context_enum = 6 THEN T2."name"
                    WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
-                   WHEN T1.context_enum = #{activity} AND T1.service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                    WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                    WHEN T1.context_enum = #{medication} THEN T3."name"
                    WHEN T1.context_enum = #{device} THEN T4."name"
@@ -226,7 +225,6 @@
                           WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                           WHEN T1.context_enum = 6 THEN T2."name"
                           WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
-                          WHEN T1.context_enum = #{activity} AND T1.service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                           WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                           WHEN T1.context_enum = #{medication} THEN T3."name"
                           WHEN T1.context_enum = #{device} THEN T4."name"

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml

@@ -231,7 +231,7 @@
                ae.priority_enum,
                ae.organization_id,
                ae.start_time                     AS in_hos_time,
-               COALESCE(bed.start_time, ae.start_time) AS start_time,
+               bed.start_time,
                bed.location_id                   AS bed_id,
                bed.location_name                 AS bed_name,
                house.location_id                 AS house_id,

openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml

@@ -96,14 +96,22 @@
                                 INNER JOIN med_medication_request AS T5
                                     ON T4.med_req_id = T5.id
                                         AND T5.delete_flag = '0'
-                   WHERE <if test="statusEnum == null">
-                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+                   WHERE EXISTS (
+                            SELECT 1 FROM wor_supply_request wsr
+                            WHERE wsr.type_enum = 3
+                            AND wsr.delete_flag = '0'
+                            AND wsr.bus_no = T4.summary_no
+                            AND T4.summary_no IS NOT NULL
+                            AND T4.summary_no != ''
+                        )
+                        AND <if test="statusEnum == null">
+                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},8)
                          </if>
                          <if test="statusEnum == 3">
-                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
+                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared},8)
                          </if>
                          <if test="statusEnum == 4">
-                             T4.status_enum = #{completed}
+                             T4.status_enum IN (#{completed},8)
                          </if>
                          AND T4.summary_no IS NOT NULL
                          AND T4.summary_no != ''

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -12,24 +12,12 @@
                drf.desc_json,
                drf.requester_id,
                drf.create_time,
-               ap.NAME AS patient_name,
-               CASE MIN(wsr.status_enum)
-                   WHEN 1 THEN 0
-                   WHEN 2 THEN 1
-                   WHEN 3 THEN 4
-                   WHEN 4 THEN 4
-                   WHEN 5 THEN 5
-                   WHEN 6 THEN 5
-                   WHEN 7 THEN 5
-                   ELSE NULL
-               END AS status
+               ap.NAME AS patient_name
         FROM doc_request_form AS drf
                  LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
             AND ae.delete_flag = '0'
                  LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
             AND ap.delete_flag = '0'
-                 LEFT JOIN wor_service_request AS wsr ON wsr.prescription_no = drf.prescription_no
-            AND wsr.delete_flag = '0'
         WHERE drf.delete_flag = '0'
           AND drf.encounter_id = #{encounterId}
           AND drf.type_code = #{typeCode}
@@ -39,33 +27,6 @@
           <if test="endDate != null and endDate != ''">
               AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
-          <if test="status != null and status != ''">
-              AND CASE MIN(wsr.status_enum)
-                      WHEN 1 THEN 0
-                      WHEN 2 THEN 1
-                      WHEN 3 THEN 4
-                      WHEN 4 THEN 4
-                      WHEN 5 THEN 5
-                      WHEN 6 THEN 5
-                      WHEN 7 THEN 5
-                      ELSE NULL
-                  END = #{status}::integer
-          </if>
-          <if test="keyword != null and keyword != ''">
-              AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
-                   OR EXISTS (
-                       SELECT 1 FROM wor_service_request wsr2
-                       WHERE wsr2.prescription_no = drf.prescription_no
-                         AND wsr2.delete_flag = '0'
-                         AND wsr2.activity_id IN (
-                             SELECT id FROM wor_activity_definition wad
-                             WHERE wad.delete_flag = '0'
-                               AND wad.name ILIKE '%' || #{keyword} || '%'
-                         )
-                   ))
-          </if>
-        GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
-                 drf.requester_id, drf.create_time, ap.name
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue

@@ -41,9 +41,9 @@
           </el-col>
         </el-row>
 
-        <!-- 工作单位（学校） -->
+        <!-- 工作单位 -->
         <el-row :gutter="16" class="form-row">
-          <el-col :span="12" class="form-item">
+          <el-col :span="24" class="form-item">
             <span class="form-label">工作单位（学校）</span>
             <el-input v-model="form.workplace" class="underline-input" />
           </el-col>

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -992,9 +992,7 @@ function handleRowClick(row) {
   selectedItems.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    // Axios interceptor already returns res.data (AjaxResult body: {code, data, items})
-    // Don't double-unwrap: if res has 'code', use res directly; otherwise fall back to res.data
-    const d = (res && res.code !== undefined) ? res : (res.data || res);
+    const d = res.data || res;
     if (d.data) Object.assign(form, d.data);
     if (d.items && Array.isArray(d.items)) {
       try {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -168,7 +168,7 @@ import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
 import {getCheck} from './api';
-import {getDepartmentList} from '@/api/public.js';
+import {getOrgList} from '@/views/doctorstation/components/api.js';
 
 const { proxy } = getCurrentInstance();
 
@@ -293,8 +293,8 @@ const hasMatchedFields = computed(() => {
 
 /** 查询科室 */
 const getLocationInfo = () => {
-  getDepartmentList().then((res) => {
-    orgOptions.value = res.data || [];
+  getOrgList().then((res) => {
+    orgOptions.value = res.data.records;
   });
 };
 
@@ -306,19 +306,17 @@ const recursionFun = (targetDepartment) => {
       name = obj.name;
     }
     const subObjArray = obj['children'];
-    if (subObjArray && subObjArray.length > 0) {
-      for (let index = 0; index < subObjArray.length; index++) {
-        const item = subObjArray[index];
-        if (item.id == targetDepartment) {
-          name = item.name;
-        }
+    for (let index = 0; index < subObjArray.length; index++) {
+      const item = subObjArray[index];
+      if (item.id == targetDepartment) {
+        name = item.name;
       }
     }
   }
   return name;
 };
 
-const handleViewDetail = async (row) => {
+const handleViewDetail = (row) => {
   console.log('targetDepartment========>', JSON.stringify(row));
 
   currentDetail.value = row;
@@ -326,15 +324,6 @@ const handleViewDetail = async (row) => {
   if (row.descJson) {
     try {
       const obj = JSON.parse(row.descJson);
-      // 确保科室数据已加载
-      if (!orgOptions.value || orgOptions.value.length === 0) {
-        await new Promise((resolve) => {
-          getDepartmentList().then((res) => {
-            orgOptions.value = res.data || [];
-            resolve();
-          });
-        });
-      }
       obj.targetDepartment = recursionFun(obj.targetDepartment);
       descJsonData.value = obj;
     } catch (e) {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue

@@ -41,6 +41,8 @@
               <el-option label="全部" value="" />
               <el-option label="待签发" value="0" />
               <el-option label="已签发" value="1" />
+              <el-option label="已采集" value="2" />
+              <el-option label="已收样" value="3" />
               <el-option label="报告已出" value="4" />
               <el-option label="已作废" value="5" />
             </el-select>
@@ -296,6 +298,8 @@ const parseBillStatus = (status) => {
   const statusMap = {
     '0': '待签发',
     '1': '已签发',
+    '2': '已采集',
+    '3': '已收样',
     '4': '报告已出',
     '5': '已作废',
   };

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue

@@ -164,7 +164,7 @@ onMounted(() => {
  * type(1：watch监听类型 2:点击保存类型)
  * selectProjectIds(选中项目的id数组)
  * */
-const projectWithDepartment = (selectProjectIds, type) => {
+const projectWithDepartment = (selectProjectIds) => {
   //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
   let isRelease = true;
   // 选中项目的数组
@@ -225,13 +225,9 @@ const submit = () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择申请单');
   }
-  // 🔧 Bug #516: 捕获用户手动选择的发往科室，避免 projectWithDepartment 将其覆盖为默认科室
-  const savedTargetDept = form.targetDepartment;
   if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
-  // 用户手动选择的发往科室优先于项目默认执行科室
-  const targetDept = savedTargetDept || form.targetDepartment;
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
     return transferValue.value.includes(item.adviceDefinitionId);
   });
@@ -242,7 +238,7 @@ const submit = () => {
       unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
       unitPrice: item.priceList[0].price /** 单价 */,
       totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: targetDept || item.positionId, // 用户指定发往科室优先于项目默认执行科室
+      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -801,10 +801,8 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  // 允许所有 statusEnum==1 的医嘱进入编辑：
-  // 1. 新医嘱（无 requestId）：待保存
-  // 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
-  if (row.statusEnum == 1) {
+  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  if (row.statusEnum == 1 && !row.requestId) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;

openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue

@@ -19,10 +19,14 @@
             <el-tab-pane label="检验申请" name="test">
               <TestApplication ref="testApplicationRef" :show-status-column="true" />
             </el-tab-pane>
+```vue
             <el-tab-pane label="检查申请" name="examine">
               <ExamineApplication ref="examineApplicationRef" />
             </el-tab-pane>
-            <!-- 汇总发药申请属于护士站职能，医生站不显示 -->
+```
+            <el-tab-pane label="汇总发药申请" name="summaryDrug">
+              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
+            </el-tab-pane>
             <el-tab-pane label="手术申请" name="surgery">
               <SurgeryApplication ref="surgeryApplicationRef" />
             </el-tab-pane>

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -11,9 +11,9 @@
     >
       <div>
         <el-radio-group v-model="type" class="ml20" @change="handleRadioChange">
-          <el-radio :label="null">全部</el-radio>
-          <el-radio :label="1">长期</el-radio>
-          <el-radio :label="2">临时</el-radio>
+          <el-radio :value="undefined">全部</el-radio>
+          <el-radio :value="1">长期</el-radio>
+          <el-radio :value="2">临时</el-radio>
         </el-radio-group>
         <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
           查询
@@ -159,7 +159,8 @@ import {formatDateStr} from '@/utils/index';
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
-const type = ref(null);
+
+const type = ref(undefined);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);