diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java index 32d22d83..4e3d9793 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; public class AdviceBaseDto { /** 医嘱类型 */ - private String adviceType; // 1:药品 , 2: 耗材 , 3:检查检验 + private String adviceType; // 1:药品 , 2: 耗材 , 3:项目 /** 医嘱定义ID */ @JsonSerialize(using = ToStringSerializer.class) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java new file mode 100644 index 00000000..e102b8ec --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java @@ -0,0 +1,84 @@ +package com.openhis.web.doctorstation.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.enums.EncounterClass; +import com.openhis.common.enums.RequestStatus; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 医嘱保存 dto + */ +@Data +@Accessors(chain = true) +public class AdviceSaveDto { + + /** 医嘱类型 */ + private String adviceType; // 1:药品 , 2: 耗材 , 3:项目 + + /** 执行次数 */ + private Integer executeNum; // 当医嘱类型为药品时,选填 + + /** 处方号 */ + private String prescriptionNo; + + /** 请求数量 */ + private Integer quantity; + + /** 请求单位编码 */ + private String unitCode; + + /** 产品批号 */ + private String lotNumber; + + /** + * 请求状态 + */ + private Integer statusEnum; + + /** 请求类型 */ + private Integer categoryEnum; + + /** 医嘱定义ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long adviceDefinitionId; + + /** 患者 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long patientId; + + /** 开方医生 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long practitionerId; + + /** 所属位置 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long locationId; + + /** 所属科室 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + /** 就诊id */ + @JsonSerialize(using = ToStringSerializer.class) + private Long encounterId; + + /** 组套id */ + @JsonSerialize(using = ToStringSerializer.class) + private Long packageId; // 该参数先预留出来 + + /** 活动(项目)定义id */ + @JsonSerialize(using = ToStringSerializer.class) + private Long activityId; // 该参数先预留出来 + + /** + * 设置默认值 + */ + public AdviceSaveDto() { + this.statusEnum = RequestStatus.DRAFT.getValue(); + this.categoryEnum = EncounterClass.AMB.getValue(); + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java new file mode 100644 index 00000000..88cc562b --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java @@ -0,0 +1,20 @@ +package com.openhis.web.doctorstation.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 医嘱保存参数类 + */ +@Data +@Accessors(chain = true) +public class AdviceSaveParam { + + /** + * 保存医嘱 dto + */ + private List adviceSaveList; + +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index c723ffad..a6728700 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -52,9 +52,6 @@ public class MedicationRequest extends HisBaseEntity { /** 产品批号 */ private String lotNumber; - /** 请求合计(元) */ - private BigDecimal displayAmount; - /** 药品请求状态 */ private Integer statusEnum; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java index 0a99a4a2..2e52c5eb 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java @@ -46,6 +46,9 @@ public class DeviceRequest extends HisBaseEntity { /** 请求意图 */ private String intentCode; + /** 请求类型 */ + private Integer categoryEnum; + /** 优先级 */ private Integer priorityEnum; @@ -67,9 +70,6 @@ public class DeviceRequest extends HisBaseEntity { /** 耗材定义id */ private Long deviceDefId; - /** 请求合计(元) */ - private BigDecimal displayAmount; - /** 器材规格 */ private String deviceSpecifications; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java index 22accef5..caed72bc 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java @@ -49,7 +49,7 @@ public class ServiceRequest extends HisBaseEntity { /** 意图 */ private Integer intentEnum; - /** 服务分类 */ + /** 请求类型 */ private Integer categoryEnum; /** 优先权 */