From 416925005bdd83633277fc0f815894954859832a Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Wed, 26 Mar 2025 17:01:39 +0800 Subject: [PATCH] up --- .../impl/DeviceManageAppServiceImpl.java | 2 ++ .../impl/ItemDefinitionServiceImpl.java | 10 +++--- .../datadictionary/dto/DeviceManageDto.java | 6 +++- .../datadictionary/dto/DeviceManageUpDto.java | 8 ++++- .../dto/MedicationManageUpDto.java | 14 +++++++- .../medication/domain/MedicationDetail.java | 35 +++++++++++++++++++ 6 files changed, 68 insertions(+), 7 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java index a7752e1a..015967ab 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java @@ -143,6 +143,8 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { e.setAllergenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAllergenFlag())); // 器材分类 e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(DeviceCategory.class, e.getCategoryEnum())); + // 器材状态 + e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum())); }); // 返回【器材目录列表DTO】分页 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java index ef6a274b..aa53dd04 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java @@ -3,6 +3,7 @@ package com.openhis.web.datadictionary.appservice.impl; import java.util.ArrayList; import java.util.List; +import com.core.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,8 +48,9 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService { .setStatusEnum(PublicationStatus.ACTIVE.getValue()) .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION) .setInstanceId(medicationDetail.getMedicationDefId()).setEffectiveStart(DateUtils.getNowDate()) - // todo 机构ID后续修改 - .setOrgId(1L) + //机构ID +// .setOrgId(SecurityUtils.getLoginUser().getOrgId()) + .setOrgId(1l)//todo 没数据先写死 // 财务类别 .setTypeCode(medicationManageUpDto.getMinimalFee()) // 医保类别 @@ -67,7 +69,7 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService { .setAmount(medicationManageUpDto.getPurchasePrice()); ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail(); - chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + chargeItemDefDetail2.setDefinitionId(chargeItemDefinition.getId()) // 单位+批次（unit,pici） 用,符号拼装 .setConditionCode( medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) @@ -77,7 +79,7 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService { shargeItemDefDetails.add(chargeItemDefDetail2); ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail(); - chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + chargeItemDefDetail3.setDefinitionId(chargeItemDefinition.getId()) // 单位+批次（unit,pici） 用,符号拼装 .setConditionCode( medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java index 6895680c..f38590d8 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java @@ -80,7 +80,8 @@ public class DeviceManageDto { private String ybMatchFlag_enumText; /** 状态 */ - private PublicationStatus statusEnum; + private Integer statusEnum; + private String statusEnum_enumText; /** 生产厂家 */ private Long manufacturerId; @@ -101,7 +102,10 @@ public class DeviceManageDto { private String jurisdiction; /** 执行科室 */ + @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name") + @JsonSerialize(using = ToStringSerializer.class) private Long ruleId; + private String ruleId_dictText; /** 器材版本 */ private String version; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java index d5921262..34f3194c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java @@ -43,7 +43,10 @@ public class DeviceManageUpDto { /** 器材分类 */ @NotNull(message = "器材分类不能为空") - private DeviceCategory categoryEnum; +// private DeviceCategory categoryEnum; + private Integer categoryEnum; + private String categoryEnum_enumText; + /** 器材种类 */ @NotBlank(message = "器材种类不能为空") @@ -135,12 +138,15 @@ public class DeviceManageUpDto { private Integer allergenFlag; /** 购入价 */ + @NotNull(message = "购入价不能为空") private BigDecimal purchasePrice; /** 零售价 */ + @NotNull(message = "零售价不能为空") private BigDecimal retailPrice; /** 最高零售价 */ + @NotNull(message = "最高零售价不能为空") private BigDecimal maximumRetailPrice; /** 最小费用 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index 6b73434b..8105f4a0 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -177,12 +178,15 @@ public class MedicationManageUpDto { private Integer characteristic; /** 购入价 */ + @NotNull(message = "购入价不能为空") private BigDecimal purchasePrice; /** 零售价 */ + @NotNull(message = "零售价不能为空") private BigDecimal retailPrice; /** 最高零售价 */ + @NotNull(message = "最高零售价不能为空") private BigDecimal maximumRetailPrice; /** 医保类别 */ @@ -212,6 +216,14 @@ public class MedicationManageUpDto { /** 是否自制 */ private Integer selfFlag; - /** 系统类别???? */ + /** DDD值 */ + private String dddCode; + /** DDD单位 */ + private String dddUnitCode; + + /** 用量限定 */ + private BigDecimal usageLimit; + + /** 系统类别???? */ } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index e9071fd9..088543d2 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -164,4 +164,39 @@ public class MedicationDetail extends HisBaseEntity { /** 产品特性 */ private Integer characteristic; + /** 所在位置 */ + private Long locationId; + + /** 贯标国家编码 */ + private String nationalDrugCode; + + /** 拆分属性 */ + private Integer partAttributeEnum; + + /** DDD值 */ + private String dddCode; + + /** DDD单位 */ + private String dddUnitCode; + + /** 单次最小用药频次 */ + private String minRateCode; + + /** 单次最大用药频次 */ + private String maxRateCode; + /** 抗生素分类 */ + private String antibioticCode; + /** 权限限制 */ + private Integer restrictedEnum; + /** 是否自制 */ + private Integer selfFlag; + /** 是否抗生素 */ + private Integer antibioticFlag; + /** 基药标识 */ + private Integer basicFlag; + /** 生产厂商文本 */ + private String manufacturerText; + /** 用量限定 */ + private BigDecimal usageLimit; + }