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 
# Conflicts:
#	openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
#	openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
This commit is contained in:
Zhang.WH
2025-03-07 17:48:31 +08:00
parent 93ae75b915 e9acd4e759
commit 56a68f78a3
114 changed files with 5077 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
View File

@@ -30,7 +30,7 @@ public class ChargeItem extends HisBaseEntity {
private Long id;
/** 状态 */
private ChargeItemStatus statusEnum;
private Integer statusEnum;
/** 层级 */
private String busNo;

5
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
View File

@@ -105,4 +105,9 @@ public class Encounter extends HisBaseEntity {
*/
private Integer displayOrder;
/**
* 初复诊
*/
private Integer firstEnum;
}

7
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
View File

@@ -1,14 +1,12 @@
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 com.openhis.common.enums.EncounterLocationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -36,7 +34,7 @@ public class EncounterLocation extends HisBaseEntity {
private Long locationId;
/** 状态枚举 */
private EncounterLocationStatus statusEnum;
private Integer statusEnum;
/** 物理形式枚举 */
private Integer formEnum;
@@ -47,5 +45,4 @@ public class EncounterLocation extends HisBaseEntity {
/** 结束时间 */
private Date endTime;
}

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

@@ -1,17 +1,13 @@
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 com.openhis.common.enums.LocationBedStatus;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.LocationMode;
import com.openhis.common.enums.LocationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -39,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;
@@ -60,7 +59,8 @@ public class Location extends HisBaseEntity {
private String wbStr;
/** 物理形式枚举 */
private LocationForm formEnum;
// private LocationForm formEnum;
private Integer formEnum;
/** 机构编码 */
private Long organizationId;
@@ -68,5 +68,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;
}
}

3
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
View File

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -25,6 +27,7 @@ public class Patient extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 活动标记 */

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
View File

@@ -39,7 +39,7 @@ public class Practitioner extends HisBaseEntity {
private String nameJson;
/** 性别编码 */
private AdministrativeGender genderEnum;
private Integer genderEnum;
/** 生日 */
private Date birthDate;

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;
}