Fix Bug #273 : 门诊医生站-》医嘱TAB页面：修改用药天数字段的值，总量字段的值未自动通过公式换算

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #389 : 住院护士站-》医嘱校对：界面筛选条件失效：勾选"临时"医嘱仍显示"长期"医嘱数据
2026-05-10 17:05:28 +08:00 · 2026-05-10 17:04:18 +08:00 · 2026-05-10 17:04:18 +08:00 · 2026-05-10 17:04:18 +08:00 · 2026-05-10 17:04:18 +08:00 · 2026-05-10 16:05:09 +08:00
7 changed files with 40 additions and 35 deletions
--- 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
@@ -147,8 +147,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
            for (OrganizationLocation organizationLocation : organizationLocationList)
                if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                    orgLoc.getStartTime(), orgLoc.getEndTime())) {
-                    String organizationName =
-                        organizationService.getById(organizationLocation.getOrganizationId()).getName();
+                    Organization org = organizationService.getById(organizationLocation.getOrganizationId());
+                    String organizationName = org != null ? org.getName() : "未知科室";
                    return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                }
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue
@@ -132,6 +132,10 @@ function onCancel() {

 // 批量添加
 async function onConfirm() {
+  if (!props.organizationId) {
+    proxy.$message.error('请先在左侧选择科室');
+    return;
+  }
  if (!formEl) return;
  formEl.value.validate(async (valid) => {
    if (!valid) return;
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -366,6 +366,10 @@ function handleBlur(row, index) {

 // 编辑或 保存当前行
 function openSaveImplementDepartment(row) {
+  if (!organizationId.value) {
+    proxy.$message.error('请先在左侧选择科室');
+    return;
+  }
  const params = {
    // 科室id
    organizationId: organizationId.value,
@@ -452,13 +456,12 @@ function handleNodeClick(res, node) {

 // 实际的节点点击处理逻辑
 function continueHandleNodeClick(node) {
-  // 新增按钮是否 disable
-  isAddDisable.value = false;
  // 检查节点是否有子节点
  if (node.data.children && node.data.children.length > 0) {
-    // proxy.$message.warning("不能选择父节点");
    return;
  }
+  // 新增按钮是否 disable
+  isAddDisable.value = false;
  // 选中科室id
  organizationId.value = node.data.id;
  // 获取 右侧 table 信息
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -313,6 +313,7 @@
                      data-prop="dispensePerDuration">
                      <el-input-number v-model="scope.row.dispensePerDuration" style="width: 80px" :min="1"
                        controls-position="right" :controls="false" :ref="(el) => (inputRefs.dispensePerDuration = el)"
+                        @change="calculateTotalAmount(scope.row, scope.$index)"
                        @keyup.enter.prevent="
                          handleEnter('dispensePerDuration', scope.row, scope.$index)
                          ">
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/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">
              {{
                [
@@ -879,14 +877,12 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
  rowIndex.value = index;
  row.showPopover = true;
-  // el-popover 懒渲染，需要等两帧组件才会挂载
  const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
  // 用 adviceType + categoryCode 组合查找匹配的选项
  const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
  const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-  // 诊疗(3)和手术(6)没有categoryCode，传空字符串给refresh，由子组件转为undefined不发送
-  // 药品(1)才有categoryCode（如'1'=中成药,'2'=西药,'4'=中草药）
-  const categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
+  // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+  const categoryCode = selectedItem ? selectedItem.categoryCode : (row.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
  const searchKey = row.adviceName || '';

  nextTick(() => {
@@ -923,8 +919,8 @@ function handleChange(value) {
      // 用 adviceType + categoryCode 组合查找匹配的选项
      const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType;
      const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-      // 诊疗/手术的categoryCode为空字符串，由子组件转为undefined不发送
-      const categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
+      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
      tableRef.refresh(adviceType, categoryCode, value);
    }
  }
@@ -1214,12 +1210,8 @@ function handleSave() {
          getListInfo(false);
          bindMethod.value = {};
          nextId.value == 1;
-
-          // 处方保存成功后，自动将医嘱信息同步至患者处置记录
-          // handleEmrTreatment();
        } else {
          proxy.$modal.msgError(res.message);
-          conso;
          isSaving.value = false;
        }
      })
@@ -1319,22 +1311,26 @@ function handleCancelEdit(row, index) {
 function handleSaveSign(row, index) {
  if (row.adviceType != 2) {
    let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
-    getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
-      if (res.data.length == 0) {
-        return;
-      }
-      let openBindDialog = localStorage.getItem('doctor' + userStore.id);
-      if (!JSON.parse(openBindDialog)) {
-        proxy.$refs['orderBindInfoRef'].open(res.data);
-      } else {
-        // 如果弹窗不提示带出的项目，自动带出
-        // 如果有未签发的项目，并且当前的项目没有带出过绑定项目，则自动带出
-        if (!bindMethod.value[itemNo]) {
-          handleOrderBindInfo(res.data);
-          bindMethod.value[itemNo] = true;
+    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;
        }
-      }
-    });
+        let openBindDialog = localStorage.getItem('doctor' + userStore.id);
+        if (!JSON.parse(openBindDialog)) {
+          proxy.$refs['orderBindInfoRef'].open(res.data);
+        } else {
+          // 如果弹窗不提示带出的项目，自动带出
+          // 如果有未签发的项目，并且当前的项目没有带出过绑定项目，则自动带出
+          if (!bindMethod.value[itemNo]) {
+            handleOrderBindInfo(res.data);
+            bindMethod.value[itemNo] = true;
+          }
+        }
+      });
+    }
  }

  // 更新UI状态
--- a/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue
@@ -273,8 +273,9 @@ function handleSearch() {
  // 清除缓存（搜索时需要重新加载）
  patientDataCache.value.clear();

-  // 重新加载所有已展开病区的患者列表
-  reloadAllPatients();
+  // 通过递增 key 强制重新渲染树组件，触发重新加载所有病区患者列表
+  // 此时 searchKey 已有值，loadPatientList 会将 searchKey 传给后端进行过滤
+  treeKey.value += 1;
 }

 // 暴露方法供外部调用
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
@@ -181,7 +181,7 @@ function handleGetPrescription() {
    getPrescriptionList({
      encounterIds: encounterIds,
      requestStatus: props.requestStatus,
-      therapyEnum: type.value === 1 ? undefined : type.value === 2 ? 1 : 2, // 1=全部(不传), 2=长期(1), 3=临时(2)
+      ...(type.value !== undefined ? { therapyEnum: type.value } : {}),
      pageSize: 10000,
      pageNo: 1,
    }).then((res) => {
Author	SHA1	Message	Date
关羽	fd8319204f	Fix Bug #273 : 门诊医生站-》医嘱TAB页面：修改用药天数字段的值，总量字段的值未自动通过公式换算 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:05:28 +08:00
关羽	637c7efd94	Fix Bug #389 : 住院护士站-》医嘱校对：界面筛选条件失效：勾选"临时"医嘱仍显示"长期"医嘱数据前端therapyEnum参数在type.value为undefined时会被序列化为字符串"undefined"传递给后端，导致后端无法正确解析而跳过过滤条件。修复为条件展开语法：仅在type.value有值时才传递therapyEnum参数，确保"全部"筛选时不传该字段以获取全部医嘱。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:04:18 +08:00
关羽	973b61bc28	Fix Bug #389 : 住院护士站-》医嘱校对：界面筛选条件失效：勾选"临时"医嘱仍显示"长期"医嘱数据根因：therapyEnum 参数映射逻辑完全颠倒。原代码：type.value === 1 ? undefined : type.value === 2 ? 1 : 2 - 选择"长期"(1)时传 undefined（不传，无过滤） - 选择"临时"(2)时传 1（长期值） - 选择"全部"时传 2（临时值）修复：直接传 type.value，与后端 therapyEnum 枚举一致： - undefined → 全部 / 1 → 长期 / 2 → 临时 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:04:18 +08:00
关羽	fb33353962	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; 语法错误	2026-05-10 17:04:18 +08:00
关羽	ad69578cc3	Fix Bug #486 : [住院医生工作站-临床医嘱] 医嘱检索框不支持全局模糊搜索，未选"医嘱类型"时检索结果为空 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:04:18 +08:00
关羽	c39c8faa5c	Fix Bug #390 : 住院护士站-医嘱执行：通过住院号检索无法定位/筛选患者原 handleSearch 调用 reloadAllPatients 仅尝试刷新已展开的病区节点，对懒加载树不可靠。改为递增 treeKey 强制树组件完全重新渲染，触发 loadNode/loadPatientList 重新从后端拉取数据并传入 searchKey 过滤。	2026-05-10 16:05:09 +08:00
关羽	659db997fd	Fix Bug #491 : 【执行科室配置】保存配置时系统报错后端修复：时间冲突校验时 organizationService.getById 可能返回 null，增加空值判断避免 NPE 前端修复：保存前校验是否已选择科室，未选择时给出提示并阻断 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 16:02:42 +08:00