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

practitioner相关

Browse Source
This commit is contained in:
anxin
2025-03-07 16:36:55 +08:00
parent ea2405595f
commit e9acd4e759
15 changed files with 359 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
View File

@@ -35,13 +35,16 @@ public class Location extends HisBaseEntity {
private String name;
/** 状态编码 */
private LocationStatus statusEnum;
// private LocationStatus statusEnum;
private Integer statusEnum;
/** 操作状态 */
private LocationBedStatus operationalEnum;
// private LocationBedStatus operationalEnum;
private Integer operationalEnum;
/** 模式编码 */
private LocationMode modeEnum;
// private LocationMode modeEnum;
private Integer modeEnum;
/** 模式编码 */
private String typeCode;
@@ -65,8 +68,8 @@ public class Location extends HisBaseEntity {
/** 显示顺序 */
private Integer displayOrder;
public Location(Long id, String busNo, String name, LocationStatus statusEnum, LocationBedStatus operationalEnum,
LocationMode modeEnum, String typeCode, String typeJson, String pyStr, String wbStr, Integer formEnum,
public Location(Long id, String busNo, String name, Integer statusEnum, Integer operationalEnum,
Integer modeEnum, String typeCode, String typeJson, String pyStr, String wbStr, Integer formEnum,
Long organizationId, Integer displayOrder) {
this.id = id;
this.busNo = busNo;

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

@@ -1,13 +1,10 @@
package com.openhis.administration.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -58,5 +55,4 @@ public class PractitionerRole extends HisBaseEntity {
/** 有效时间 */
private String availabilityJson;
}