Compare commits
2 Commits
0abc91b118
...
f17f0e8816
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f17f0e8816 | ||
| 58d4ee969a |
@@ -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());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
Reference in New Issue
Block a user