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

住院临时医嘱拆分属性追加

Browse Source
This commit is contained in:
liuhongrui
2025-03-28 09:37:01 +08:00
parent 4d4fd87aaa
commit 0a532b3978
8 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,11 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
.map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
//住院临时医嘱拆分属性的枚举
List<MedicationManageInitDto.statusEnumOption> tempOrderSplitPropertyOptions = Stream.of(TempOrderSplitPropertyCode.values())
.map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
medicationManageInitDto.setSupplierListOptions(supplierListOptions);
@@ -132,6 +137,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions);
medicationManageInitDto.setPartAttributeEnumOptions(partAttributeEnumOptions);
medicationManageInitDto.setTempOrderSplitPropertyEnumOptions(tempOrderSplitPropertyOptions);
return R.ok(medicationManageInitDto);
}

6
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
View File

@@ -190,8 +190,8 @@ public class MedicationManageDto {
private Long manufacturerId;
/** 供应商 */
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class)
private Long supplyId;
private String supplyId_dictText;
@@ -276,4 +276,8 @@ public class MedicationManageDto {
/** 最高零售价 */
private BigDecimal maximumRetailPrice;
/** 住院临时医嘱拆分属性 */
private Integer thoPartAttributeEnum;
private String thoPartAttributeEnum_enumText;
}

6
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
View File

@@ -3,6 +3,8 @@ package com.openhis.web.datadictionary.dto;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -29,6 +31,8 @@ public class MedicationManageInitDto {
private List<statusEnumOption> statusRestrictedOptions;
// 拆分属性
private List<statusEnumOption> partAttributeEnumOptions;
//住院临时医嘱拆分属性
private List<statusEnumOption> tempOrderSplitPropertyEnumOptions;
/**
* 状态
@@ -63,6 +67,8 @@ public class MedicationManageInitDto {
*/
@Data
public static class supplierListOption {
@JsonSerialize(using = ToStringSerializer.class)
private Long value;
private String label;

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

@@ -245,4 +245,6 @@ public class MedicationManageUpDto {
/** 基药标识 */
private Integer basicFlag;
/** 住院临时医嘱拆分属性 */
private Integer thoPartAttributeEnum;
}

3
openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
View File

@@ -59,6 +59,7 @@
T6.characteristic,
T6.national_drug_code,
T6.part_attribute_enum,
T6.tho_part_attribute_enum,
T6.antibiotic_code,
T6.restricted_enum,
T6.self_flag,
@@ -131,6 +132,7 @@
T1.characteristic,
T1.national_drug_code,
T1.part_attribute_enum,
T1.tho_part_attribute_enum,
T1.antibiotic_code,
T1.restricted_enum,
T1.self_flag,
@@ -225,6 +227,7 @@
T1.characteristic,
T1.national_drug_code,
T1.part_attribute_enum,
T1.tho_part_attribute_enum,
T1.antibiotic_code,
T1.restricted_enum,
T1.self_flag,