From 22e46a05459ea24441953885e8a7062d1a21edb0 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 28 Mar 2025 17:33:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=80=85=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/PractitionerRolesDto.java | 6 +++ .../DoctorStationAdviceAppServiceImpl.java | 15 +++--- .../doctorstation/dto/AdviceInventoryDto.java | 20 +++---- .../basedatamanage/PractitionerAppMapper.xml | 1 + .../DoctorStationAdviceAppMapper.xml | 52 ++++++++++--------- .../openhis/common/enums/ConditionCode.java | 2 +- 6 files changed, 55 insertions(+), 41 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java index f8b19a3d..bb70bb01 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java @@ -18,6 +18,12 @@ public class PractitionerRolesDto { */ @JsonSerialize(using = ToStringSerializer.class) private Long roleId; + + /** + * 角色code + */ + private String roleCode; + /** * 角色名称 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 7f082eb0..e567bb6c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -83,7 +83,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp IPage adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo(new Page<>(pageNo, pageSize), CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION, - CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getInfo(), queryWrapper); + CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, DeviceCategory.SINGLE_USE.getCode(), queryWrapper); List adviceBaseDtoList = adviceBaseInfo.getRecords(); // 医嘱定义ID集合 List adviceDefinitionIdList = @@ -123,16 +123,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp String finalUnitCode = unitCode; // 匹配包装单位 List advicePrice1 = childCharge.stream() - .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) && e.getConditionValue() - .equals(String.format(CommonConstants.Common.COMMA_FORMAT, finalUnitCode, - adviceInventoryDto.getLotNumber()))) + .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId) + && e.getConditionValue().equals(adviceInventoryDto.getLotNumber())) .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode .collect(Collectors.toList()); priceDtoList.addAll(advicePrice1); } + // 价格信息 + baseDto.setPriceList(priceDtoList); } // 诊疗活动 - else { + else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(baseDto.getAdviceTableName())) { List priceList = mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId())) .collect(Collectors.toList()); @@ -144,6 +145,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp } } + return adviceBaseInfo; + // 下面的注释不要删除 2025.03.27 // // 药品和耗材 // List medicationAndDeviceList = adviceBaseDtoList.stream() @@ -206,7 +209,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp // // 价格信息 // baseDto.setPriceList(priceList); // } - return adviceBaseInfo; + } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java index 7c6f5530..412a02e8 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java @@ -23,16 +23,16 @@ public class AdviceInventoryDto { @JsonSerialize(using = ToStringSerializer.class) private Long itemId; - /** 当前库存数量(包装单位) */ - private BigDecimal baseQuantity; - - /** 包装单位 */ - @Dict(dictCode = "unit_code") - private String baseUnitCode; - private String baseUnitCode_dictText; - - /** 当前库存数量(最小单位) */ - private BigDecimal minQuantity; +// /** 当前库存数量(包装单位) */ +// private BigDecimal baseQuantity; +// +// /** 包装单位 */ +// @Dict(dictCode = "unit_code") +// private String baseUnitCode; +// private String baseUnitCode_dictText; +// +// /** 当前库存数量(最小单位) */ +// private BigDecimal minQuantity; /** 最小单位 */ @Dict(dictCode = "unit_code") diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml index eb75fe31..2a78d22d 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml @@ -48,6 +48,7 @@