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

药品类别改为发放类别

Browse Source
This commit is contained in:
anxin
2025-03-27 14:10:55 +08:00
parent bfad955f79
commit 58cdabcb55
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
View File

@@ -35,8 +35,8 @@ public class OrgLocQueryDto {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long defLocationId; private Long defLocationId;
/** 药品类别 */ /** 发放类别 */
private String medCategoryCode; private String distributionCategoryCode;
/** 开始时间 */ /** 开始时间 */
private Date startTime; private Date startTime;

6
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity; import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.annotation.Dict;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -40,8 +41,9 @@ public class OrganizationLocation extends HisBaseEntity {
/** 默认执行科室 */ /** 默认执行科室 */
private Long defOrganizationId; private Long defOrganizationId;
/** 药品类别 */ /** 发放类别 */
private String medCategoryCode; @Dict(dictCode = "distribution_category_code")
private String distributionCategoryCode;
/** 开始时间 */ /** 开始时间 */
private Date startTime; private Date startTime;