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

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

@@ -11,4 +11,11 @@ import com.openhis.administration.domain.Account;
*/
public interface IAccountService extends IService<Account> {
/**
* 门诊挂号时保存账号信息
*
* @param account 账号信息
*/
Long saveAccountByRegister(Account account);
}

9
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
View File

@@ -1,11 +1,9 @@
package com.openhis.administration.service;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.workflow.domain.SupplyRequest;
/**
* 费用项管理Service接口
@@ -21,4 +19,11 @@ public interface IChargeItemService extends IService<ChargeItem> {
* @param chargeItemList 采购账单
*/
void createBilledPurchaseCharge(List<ChargeItem> chargeItemList);
/**
* 门诊挂号时保存 费用项
*
* @param chargeItem 费用项
*/
void saveChargeItemByRegister(ChargeItem chargeItem);
}

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

@@ -11,4 +11,11 @@ import com.openhis.administration.domain.EncounterLocation;
*/
public interface IEncounterLocationService extends IService<EncounterLocation> {
/**
* 门诊挂号时保存就诊位置信息
*
* @param encounterLocation 就诊位置信息
*/
void saveEncounterLocationByRegister(EncounterLocation encounterLocation);
}

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

@@ -11,4 +11,11 @@ import com.openhis.administration.domain.EncounterParticipant;
*/
public interface IEncounterParticipantService extends IService<EncounterParticipant> {
/**
* 门诊挂号时保存就诊参与者
*
* @param encounterParticipant 就诊参与者信息
*/
void saveEncounterParticipantByRegister(EncounterParticipant encounterParticipant);
}

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

@@ -10,5 +10,12 @@ import com.openhis.administration.domain.Encounter;
* @date 2025-02-20
*/
public interface IEncounterService extends IService<Encounter> {
/**
* 保存就诊信息
*
* @param encounter 就诊信息
* @return 保存后的信息
*/
Long saveEncounterByRegister(Encounter encounter);
}

11
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
View File

@@ -16,4 +16,15 @@ import com.openhis.administration.service.IAccountService;
@Service
public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements IAccountService {
/**
* 门诊挂号时保存账号信息
*
* @param account 账号信息
*/
@Override
public Long saveAccountByRegister(Account account) {
baseMapper.insert(account);
return account.getId();
}
}

10
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
View File

@@ -32,4 +32,14 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
public void createBilledPurchaseCharge(List<ChargeItem> chargeItemList) {
}
/**
* 门诊挂号时保存 费用项
*
* @param chargeItem 费用项
*/
@Override
public void saveChargeItemByRegister(ChargeItem chargeItem) {
baseMapper.insert(chargeItem);
}
}

13
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
View File

@@ -14,6 +14,17 @@ import com.openhis.administration.service.IEncounterLocationService;
* @date 2025-02-20
*/
@Service
public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationMapper, EncounterLocation> implements IEncounterLocationService {
public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationMapper, EncounterLocation>
implements IEncounterLocationService {
/**
* 门诊挂号时保存就诊位置信息
*
* @param encounterLocation 就诊位置信息
*/
@Override
public void saveEncounterLocationByRegister(EncounterLocation encounterLocation) {
baseMapper.insert(encounterLocation);
}
}

13
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
View File

@@ -14,6 +14,17 @@ import com.openhis.administration.service.IEncounterParticipantService;
* @date 2025-02-20
*/
@Service
public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterParticipantMapper, EncounterParticipant> implements IEncounterParticipantService {
public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterParticipantMapper, EncounterParticipant>
implements IEncounterParticipantService {
/**
* 门诊挂号时保存就诊参与者
*
* @param encounterParticipant 就诊参与者信息
*/
@Override
public void saveEncounterParticipantByRegister(EncounterParticipant encounterParticipant) {
baseMapper.insert(encounterParticipant);
}
}

33
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
View File

@@ -1,11 +1,17 @@
package com.openhis.administration.service.impl;
import javax.annotation.Resource;
import com.core.common.enums.AssignSeqEnum;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.AssignSeqUtil;
import com.openhis.administration.domain.Encounter;
import com.openhis.administration.mapper.EncounterMapper;
import com.openhis.administration.service.IEncounterService;
import com.openhis.common.enums.EncounterType;
/**
* 就诊管理Service业务层处理
@@ -16,4 +22,31 @@ import com.openhis.administration.service.IEncounterService;
@Service
public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter> implements IEncounterService {
@Resource
AssignSeqUtil assignSeqUtil;
/**
* 保存就诊信息
*
* @param encounter 就诊信息
* @return 保存后的信息
*/
@Override
public Long saveEncounterByRegister(Encounter encounter) {
// 生成就诊编码
encounter.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 8));
// 生成就诊序号 (患者ID + 科室ID 作为当日就诊号的唯一标识)
String preFix = encounter.getPatientId() + String.valueOf(encounter.getOrganizationId());
encounter.setDisplayOrder(assignSeqUtil.getSeqNoByDay(preFix));
// 患者ID
Long patientId = encounter.getPatientId();
// 初复诊
Long count = baseMapper.selectCount(new LambdaQueryWrapper<Encounter>().eq(Encounter::getPatientId, patientId));
if (count > 0L) {
encounter.setFirstEnum(EncounterType.FOLLOW_UP.getValue());
}
baseMapper.insert(encounter);
return encounter.getId();
}
}

85
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java Normal file
View File

@@ -0,0 +1,85 @@
package com.openhis.clinical.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;
/**
* 过敏与不耐受Entity实体
*
* @author system
* @date 2025-03-07
*/
@Data
@TableName("cli_allergy_intolerance")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class AllergyIntolerance extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 服务申请ID */
private Long requestId;
/** 临床状况 */
private Integer clinicalStatusEnum;
/** 验证状态 */
private Integer verificationStatusEnum;
/** 类型 */
private Integer typeEnum;
/** 过敏原类别 */
private String categoryCode;
/** 危险程度 */
private Integer criticalityEnum;
/** 过敏物质编码 */
private String code;
/** 患者ID */
private Long patientId;
/** 反应描述 */
private String description;
/** 严重程度 */
private Integer severityEnum;
/** 过敏发生开始日期 */
private Date onsetDateTime;
/** 记录者 */
private Long practitionerId;
/** 断言者 */
private Long checkPractitionerId;
/** 记录日期 */
private Date recordedDate;
/** 最后反应发生日期 */
private Date lastReactionOccurrence ;
/** 曝光路线 */
private String exposureRoute;
/** 备注 */
private String note;
/** 删除状态 */
private String deleteFlag;
}

5
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
View File

@@ -4,6 +4,8 @@ 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.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.enums.ConditionDefinitionSource;
import com.openhis.common.enums.PublicationStatus;
@@ -25,6 +27,7 @@ public class ConditionDefinition extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 所属分类 */
@@ -58,6 +61,6 @@ public class ConditionDefinition extends HisBaseEntity {
private Integer ybMatchFlag;
/** 状态 */
private PublicationStatus statusEnum;
private Integer statusEnum;
}

17
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.openhis.clinical.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.clinical.domain.AllergyIntolerance;
/**
* 过敏与不耐受Mapper接口
*
* @author system
* @date 2025-03-07
*/
@Repository
public interface AllergyIntoleranceMapper extends BaseMapper<AllergyIntolerance> {
}

14
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.openhis.clinical.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.clinical.domain.AllergyIntolerance;
/**
* 过敏与不耐受Service接口
*
* @author system
* @date 2025-03-07
*/
public interface IAllergyIntoleranceService extends IService<AllergyIntolerance> {
}

19
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java Normal file
View File

@@ -0,0 +1,19 @@
package com.openhis.clinical.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.clinical.domain.AllergyIntolerance;
import com.openhis.clinical.mapper.AllergyIntoleranceMapper;
import com.openhis.clinical.service.IAllergyIntoleranceService;
/**
* 过敏与不耐受Service业务层处理
*
* @author system
* @date 2025-03-07
*/
@Service
public class AllergyIntoleranceServiceImpl extends ServiceImpl<AllergyIntoleranceMapper, AllergyIntolerance> implements IAllergyIntoleranceService {
}

7
openhis-server/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.clinical.mapper.AllergyIntoleranceMapper">
</mapper>