Fix Bug #488: 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误

- 修复 handleSaveSign 中 getBindDevice 调用时 itemNo 可能为 undefined 导致的后端报错 "Required request parameter 'itemNo' for method parameter type String is not present"：增加 itemNo 空值检查，为空时 console.warn 跳过调用而非发送无效请求
- 移除模板中两处调试残留：console.log 表达式渲染到页面（类型列和频次/用法列）
- 修复签发失败处理中截断的 conso; 语法错误

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

@@ -147,8 +147,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
             for (OrganizationLocation organizationLocation : organizationLocationList)
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
-                    Organization org = organizationService.getById(organizationLocation.getOrganizationId());
+                    String organizationName =
-                    String organizationName = org != null ? org.getName() : "未知科室";
+                        organizationService.getById(organizationLocation.getOrganizationId()).getName();
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
                         + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                 }

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

@@ -169,7 +169,7 @@
                    T1.performer_check_id,
                    T2."name" AS advice_name,
                    T2.id AS item_id,
-                   T3.total_volume AS volume,
+                   (SELECT mm.total_volume FROM med_medication mm WHERE mm.medication_def_id = T2.id AND mm.delete_flag = '0' LIMIT 1) AS volume,
                    T1.lot_number AS lot_number,
                    T1.quantity AS quantity,
                    T1.unit_code AS unit_code,
@@ -199,14 +199,11 @@
                    personal_account.balance_amount,
                    personal_account.id AS account_id,
                    T2.category_code,
-                   mmd.status_enum AS dispense_status
+                   (SELECT mmd.status_enum FROM med_medication_dispense mmd WHERE mmd.med_req_id = T1.id AND mmd.delete_flag = '0' LIMIT 1) AS dispense_status
             FROM med_medication_request AS T1
                      LEFT JOIN med_medication_definition AS T2
                                ON T2.id = T1.medication_id
                                    AND T2.delete_flag = '0'
-                     LEFT JOIN med_medication AS T3
-                               ON T3.medication_def_id = T2.ID
-                                   AND T3.delete_flag = '0'
                      LEFT JOIN adm_location AS al1
                                ON al1.id = T1.perform_location
                                    AND al1.delete_flag = '0'
@@ -280,9 +277,6 @@
                                          aa.balance_amount
                            ) AS personal_account
                               ON personal_account.encounter_id = ae.id
-                     LEFT JOIN med_medication_dispense mmd
-                               ON mmd.med_req_id = T1.id
-                                   AND mmd.delete_flag = '0'
                 WHERE T1.delete_flag = '0'
                 AND T1.refund_medicine_id IS NULL
                 AND T1.generate_source_enum = #{doctorPrescription}

openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue

@@ -132,10 +132,6 @@ function onCancel() {
 
 // 批量添加
 async function onConfirm() {
-  if (!props.organizationId) {
-    proxy.$message.error('请先在左侧选择科室');
-    return;
-  }
   if (!formEl) return;
   formEl.value.validate(async (valid) => {
     if (!valid) return;

openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue

@@ -366,10 +366,6 @@ function handleBlur(row, index) {
 
 // 编辑或 保存当前行
 function openSaveImplementDepartment(row) {
-  if (!organizationId.value) {
-    proxy.$message.error('请先在左侧选择科室');
-    return;
-  }
   const params = {
     // 科室id
     organizationId: organizationId.value,
@@ -456,12 +452,13 @@ function handleNodeClick(res, node) {
 
 // 实际的节点点击处理逻辑
 function continueHandleNodeClick(node) {
-  // 检查节点是否有子节点
-  if (node.data.children && node.data.children.length > 0) {
-    return;
-  }
   // 新增按钮是否 disable
   isAddDisable.value = false;
+  // 检查节点是否有子节点
+  if (node.data.children && node.data.children.length > 0) {
+    // proxy.$message.warning("不能选择父节点");
+    return;
+  }
   // 选中科室id
   organizationId.value = node.data.id;
   // 获取 右侧 table 信息

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

@@ -122,7 +122,6 @@
 
         <el-table-column label="类型" align="center" prop="" width="120">
           <template #default="scope">
-            {{ console.log(scope.row, 1111) }}
             <el-radio-group
               v-model="scope.row.therapyEnum"
               size="small"
@@ -270,7 +269,6 @@
         </el-table-column>
         <el-table-column label="频次/用法" align="center" prop="" width="180">
           <template #default="scope">
-            {{ console.log(scope.row) }}
             <span v-if="!scope.row.isEdit && scope.row.adviceType == 1" style="text-align: right">
               {{
                 [
@@ -1214,12 +1212,8 @@ function handleSave() {
           getListInfo(false);
           bindMethod.value = {};
           nextId.value == 1;
-
-          // 处方保存成功后，自动将医嘱信息同步至患者处置记录
-          // handleEmrTreatment();
         } else {
           proxy.$modal.msgError(res.message);
-          conso;
           isSaving.value = false;
         }
       })
@@ -1319,6 +1313,9 @@ function handleCancelEdit(row, index) {
 function handleSaveSign(row, index) {
   if (row.adviceType != 2) {
     let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
+    if (!itemNo) {
+      console.warn('绑定设备检查跳过：itemNo为空（adviceType=' + row.adviceType + ', adviceName=' + row.adviceName + '）');
+    } else {
       getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
         if (res.data.length == 0) {
           return;
@@ -1336,6 +1333,7 @@ function handleSaveSign(row, index) {
         }
       });
     }
+  }
 
   // 更新UI状态
   row.isEdit = false;

openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue

@@ -273,9 +273,8 @@ function handleSearch() {
   // 清除缓存（搜索时需要重新加载）
   patientDataCache.value.clear();
 
-  // 通过递增 key 强制重新渲染树组件，触发重新加载所有病区患者列表
+  // 重新加载所有已展开病区的患者列表
-  // 此时 searchKey 已有值，loadPatientList 会将 searchKey 传给后端进行过滤
+  reloadAllPatients();
-  treeKey.value += 1;
 }
 
 // 暴露方法供外部调用