wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-26 17:23:42 +08:00
parent 416925005b
commit a5da9e612b
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
View File

@@ -3,11 +3,11 @@ package com.openhis.web.datadictionary.appservice.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.core.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.core.common.utils.DateUtils; import com.core.common.utils.DateUtils;
import com.core.common.utils.StringUtils;
import com.openhis.administration.domain.ChargeItemDefDetail; import com.openhis.administration.domain.ChargeItemDefDetail;
import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.domain.ChargeItemDefinition;
import com.openhis.administration.service.IChargeItemDefDetailService; import com.openhis.administration.service.IChargeItemDefDetailService;
@@ -48,9 +48,9 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
.setStatusEnum(PublicationStatus.ACTIVE.getValue()) .setStatusEnum(PublicationStatus.ACTIVE.getValue())
.setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION) .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
.setInstanceId(medicationDetail.getMedicationDefId()).setEffectiveStart(DateUtils.getNowDate()) .setInstanceId(medicationDetail.getMedicationDefId()).setEffectiveStart(DateUtils.getNowDate())
//机构ID // 机构ID
// .setOrgId(SecurityUtils.getLoginUser().getOrgId()) // .setOrgId(SecurityUtils.getLoginUser().getOrgId())
.setOrgId(1l)//todo 没数据先写死 .setOrgId(1l)// todo 没数据先写死
// 财务类别 // 财务类别
.setTypeCode(medicationManageUpDto.getMinimalFee()) .setTypeCode(medicationManageUpDto.getMinimalFee())
// 医保类别 // 医保类别
@@ -63,16 +63,16 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
ChargeItemDefDetail chargeItemDefDetail1 = new ChargeItemDefDetail(); ChargeItemDefDetail chargeItemDefDetail1 = new ChargeItemDefDetail();
chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId())
// 单位+批次（unit,pici） 用,符号拼装 // 单位+批次（unit,pici） 用,符号拼装
.setConditionCode( .setConditionCode(StringUtils.joinStrings(
medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
// 购入价 // 购入价
.setAmount(medicationManageUpDto.getPurchasePrice()); .setAmount(medicationManageUpDto.getPurchasePrice());
ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail(); ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail();
chargeItemDefDetail2.setDefinitionId(chargeItemDefinition.getId()) chargeItemDefDetail2.setDefinitionId(chargeItemDefinition.getId())
// 单位+批次（unit,pici） 用,符号拼装 // 单位+批次（unit,pici） 用,符号拼装
.setConditionCode( .setConditionCode(StringUtils.joinStrings(
medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
// 零售价 // 零售价
.setAmount(medicationManageUpDto.getRetailPrice()); .setAmount(medicationManageUpDto.getRetailPrice());
@@ -81,8 +81,8 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail(); ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail();
chargeItemDefDetail3.setDefinitionId(chargeItemDefinition.getId()) chargeItemDefDetail3.setDefinitionId(chargeItemDefinition.getId())
// 单位+批次（unit,pici） 用,符号拼装 // 单位+批次（unit,pici） 用,符号拼装
.setConditionCode( .setConditionCode(StringUtils.joinStrings(
medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
// 最高零售价 // 最高零售价
.setAmount(medicationManageUpDto.getMaximumRetailPrice()); .setAmount(medicationManageUpDto.getMaximumRetailPrice());

6
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
View File

@@ -180,11 +180,11 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum())); e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
// 是否自制 // 是否自制
e.setSelfFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getSelfFlag())); e.setSelfFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSelfFlag()));
// 是否抗生素 // 是否抗生素
e.setAntibioticFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getAntibioticFlag())); e.setAntibioticFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAntibioticFlag()));
// 基药标识 // 基药标识
e.setBasicFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getBasicFlag())); e.setBasicFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getBasicFlag()));
// // 活动标记 // // 活动标记
// e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())); // e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
View File

@@ -53,6 +53,7 @@ public class MedicationManageUpDto {
private Integer activeFlag; private Integer activeFlag;
/** 批次号 */ /** 批次号 */
@NotBlank(message = "批次号不能为空")
private String lotNumber; private String lotNumber;
/** 生效日期 */ /** 生效日期 */
@@ -74,6 +75,7 @@ public class MedicationManageUpDto {
/** 剂量单位 */ /** 剂量单位 */
@Dict(dictCode = "unit_code") @Dict(dictCode = "unit_code")
@NotBlank(message = "剂量单位不能为空")
private String doseUnitCode; private String doseUnitCode;
private String doseUnitCode_dictText; private String doseUnitCode_dictText;