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

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source
This commit is contained in:
liuhongrui
2025-03-13 10:59:32 +08:00
parent 69d8003761 b4e3b8ef2b
commit 97875bc662
5 changed files with 128 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,6 @@ 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 com.openhis.common.enums.LocationBedStatus;
import com.openhis.common.enums.LocationMode;
import com.openhis.common.enums.LocationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -68,22 +65,22 @@ public class Location extends HisBaseEntity {
/** 显示顺序 */
private Integer displayOrder;
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;
this.name = name;
this.statusEnum = statusEnum;
this.operationalEnum = operationalEnum;
this.modeEnum = modeEnum;
this.typeCode = typeCode;
this.typeJson = typeJson;
this.pyStr = pyStr;
this.wbStr = wbStr;
this.formEnum = formEnum;
this.organizationId = organizationId;
this.displayOrder = displayOrder;
}
// 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;
// this.name = name;
// this.statusEnum = statusEnum;
// this.operationalEnum = operationalEnum;
// this.modeEnum = modeEnum;
// this.typeCode = typeCode;
// this.typeJson = typeJson;
// this.pyStr = pyStr;
// this.wbStr = wbStr;
// this.formEnum = formEnum;
// this.organizationId = organizationId;
// this.displayOrder = displayOrder;
// }
}