Compare commits

...

2 Commits

Author SHA1 Message Date
赵云
f17f0e8816 Fix Bug #501: 【住院护士站-医嘱执行】医嘱执行页面点击"取消执行"报错
修复 adviceCancel 方法中两处复制粘贴错误:
1. 长期已发放药品处理中误用 tempMedDispensedList 替代 longMedDispensedList
2. 长期未发放药品处理中误用 tempMedUndispenseList 替代 longMedUndispenseList

导致取消执行时数据处理混乱,引发 SQL 异常

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-11 11:18:24 +08:00
58d4ee969a bug 273 门诊医生站-》医嘱TAB页面:修改用药天数字段的值,总量字段的值未自动通过公式换算 补充:修改单词用量和用药频次时也自动换算总量字段 2026-05-11 11:18:24 +08:00
2 changed files with 6 additions and 4 deletions

View File

@@ -523,7 +523,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
// 处理长期已发放的药品 // 处理长期已发放的药品
if (!longMedDispensedList.isEmpty()) { if (!longMedDispensedList.isEmpty()) {
// 生成退药单 // 生成退药单
this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap); this.creatRefundMedicationList(longMedDispensedList, procedureIdMap);
} }
// 处理临时已发放药品 // 处理临时已发放药品
if (!tempMedDispensedList.isEmpty()) { if (!tempMedDispensedList.isEmpty()) {
@@ -653,7 +653,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
if (!longMedUndispenseList.isEmpty()) { if (!longMedUndispenseList.isEmpty()) {
// 排除已汇总的药品 // 排除已汇总的药品
List<MedicationDispense> medicationDispenseList List<MedicationDispense> medicationDispenseList
= tempMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList(); = longMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList();
medicationDispenseService medicationDispenseService
.removeByIds(medicationDispenseList.stream().map(MedicationDispense::getId).toList()); .removeByIds(medicationDispenseList.stream().map(MedicationDispense::getId).toList());
} }

View File

@@ -246,7 +246,8 @@
<el-input-number :min="0" v-model="scope.row.doseQuantity" controls-position="right" <el-input-number :min="0" v-model="scope.row.doseQuantity" controls-position="right"
:controls="false" style="width: 70px; margin-right: 20px" :controls="false" style="width: 70px; margin-right: 20px"
:ref="(el) => (inputRefs.doseQuantity = el)" @input="convertValues(scope.row, scope.$index)" :ref="(el) => (inputRefs.doseQuantity = el)" @input="convertValues(scope.row, scope.$index)"
@keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)" /> @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)"
@change="calculateTotalAmount(scope.row, scope.$index)"/>
</el-form-item> </el-form-item>
<!-- 剂量单位 --> <!-- 剂量单位 -->
<el-select v-model="scope.row.minUnitCode" style="width: 70px; margin-right: 20px" placeholder=" "> <el-select v-model="scope.row.minUnitCode" style="width: 70px; margin-right: 20px" placeholder=" ">
@@ -294,7 +295,8 @@
} }
// inputRefs.rateCode.blur(); // inputRefs.rateCode.blur();
} }
" :ref="(el) => (inputRefs.rateCode = el)"> " :ref="(el) => (inputRefs.rateCode = el)"
@change="calculateTotalAmount(scope.row, scope.$index)">
<el-option v-for="dict in rate_code" @click="() => (scope.row.rateCode_dictText = dict.label)" <el-option v-for="dict in rate_code" @click="() => (scope.row.rateCode_dictText = dict.label)"
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>