From 5b0bff9211f9a8e512192cf67d0abf4918ac5969 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Tue, 25 Mar 2025 16:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E7=96=97=E7=9B=AE=E5=BD=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ItemDefinitionServiceImpl.java | 43 +++++++++++++------ .../DiagnosisTreatmentController.java | 4 ++ .../dto/DiagnosisTreatmentDto.java | 6 ++- 3 files changed, 39 insertions(+), 14 deletions(-) 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 c36fb9dc..fde1002d 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 @@ -1,16 +1,16 @@ package com.openhis.web.datadictionary.appservice.impl; -import com.openhis.administration.domain.ChargeItemDefDetail; -import com.openhis.administration.service.IChargeItemDefinitionService; -import com.openhis.workflow.domain.ServiceRequest; -import liquibase.pro.packaged.S; +import java.util.ArrayList; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.core.common.utils.DateUtils; +import com.openhis.administration.domain.ChargeItemDefDetail; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.service.IChargeItemDefDetailService; -import com.openhis.administration.service.IChargeItemService; +import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.PublicationStatus; import com.openhis.common.enums.Whether; @@ -18,9 +18,6 @@ import com.openhis.medication.domain.MedicationDetail; import com.openhis.web.datadictionary.appservice.IItemDefinitionService; import com.openhis.web.datadictionary.dto.MedicationManageUpDto; -import java.util.ArrayList; -import java.util.List; - /** * 项目定价 实现 * @@ -65,11 +62,33 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService { chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) // 单位+批次（unit,pici） 用,符号拼装 .setConditionCode( - medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()); -// .setAmount(1) - shargeItemDefDetails.add(chargeItemDefDetail1); + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 购入价 + .setAmount(medicationManageUpDto.getPurchasePrice()).setPriority(0); + + ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail(); + chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + // 单位+批次（unit,pici） 用,符号拼装 + .setConditionCode( + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 零售价 + .setAmount(medicationManageUpDto.getRetailPrice()).setPriority(1); + + shargeItemDefDetails.add(chargeItemDefDetail2); + + ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail(); + chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + // 单位+批次（unit,pici） 用,符号拼装 + .setConditionCode( + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 最高零售价 + .setAmount(medicationManageUpDto.getMaximumRetailPrice()).setPriority(2); + + shargeItemDefDetails.add(chargeItemDefDetail3); + + return chargeItemDefDetailService.saveBatch(shargeItemDefDetails); } - // 添加子表信息 + return false; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index 1b719c75..2e79edad 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -151,6 +151,10 @@ public class DiagnosisTreatmentController { e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag())); //类型举类回显赋值 e.setTypeEnum_enumText(EnumUtils.getInfoByValue(ActivityType.class, e.getTypeEnum())); + //目录类别举类回显赋值 + e.setCategory_enumText(EnumUtils.getInfoByValue(ActivityDefCategory.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/dto/DiagnosisTreatmentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index 881a4132..154f3ad6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -24,7 +24,8 @@ public class DiagnosisTreatmentDto { private Long id; /** 目录类别 */ - private ActivityDefCategory categoryEnum; + private Integer categoryEnum; + private String category_enumText; /** 编码 */ private String busNo; @@ -57,7 +58,8 @@ public class DiagnosisTreatmentDto { private String ybMatchFlag_enumText; /** 状态 */ - private PublicationStatus statusEnum; + private Integer statusEnum; + private String statusEnum_enumText; /** 身体部位 */ private String bodySiteCode;