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:
anxin
2025-02-26 18:32:49 +08:00
parent 63b6ab796c e500a2374d
commit 215d87133e
21 changed files with 1160 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
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.DeviceCategory;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -81,7 +81,7 @@ public class DeviceDefinition extends HisBaseEntity {
private Integer ybMatchFlag;
/** 状态 */
private Integer statusEnum;
private PublicationStatus statusEnum;
/** 生产厂家 */
private Long manufacturerId;
@@ -107,5 +107,4 @@ public class DeviceDefinition extends HisBaseEntity {
/** 过敏标记 */
private Integer allergenFlag;
}

15
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
View File

@@ -11,4 +11,19 @@ import com.openhis.administration.domain.DeviceDefinition;
*/
public interface IDeviceDefinitionService extends IService<DeviceDefinition> {
/**
* 新增器材目录
*
* @param deviceDefinition 耗材器材实体
* @return
*/
boolean addDevice(DeviceDefinition deviceDefinition);
/**
* 新增医保器材目录
*
* @param deviceDefinition 器材目录实体
* @return
*/
boolean addYbDevice(DeviceDefinition deviceDefinition);
}

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

@@ -1,19 +1,50 @@
package com.openhis.administration.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.DeviceDefinition;
import com.openhis.administration.mapper.DeviceDefinitionMapper;
import com.openhis.administration.service.IDeviceDefinitionService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 器材定义管理Service业务层处理
*
* @author system
* @date 2025-02-20
*/
@Slf4j
@Service
public class DeviceDefinitionServiceImpl extends ServiceImpl<DeviceDefinitionMapper, DeviceDefinition> implements IDeviceDefinitionService {
@AllArgsConstructor
public class DeviceDefinitionServiceImpl extends ServiceImpl<DeviceDefinitionMapper, DeviceDefinition>
implements IDeviceDefinitionService {
private final DeviceDefinitionMapper deviceDefinitionMapper;
@Override
public boolean addDevice(DeviceDefinition deviceDefinition) {
// 根据器材编码判断器材是否存在
List<DeviceDefinition> activityDefinitions = deviceDefinitionMapper.selectList(
new LambdaQueryWrapper<DeviceDefinition>().eq(DeviceDefinition::getBusNo, deviceDefinition.getBusNo()));
if (activityDefinitions.size() > 0) {
return false;
}
// 新增器材项目
int insert = deviceDefinitionMapper.insert(deviceDefinition);
if (insert != 1) {
return false;
}
return true;
}
@Override
public boolean addYbDevice(DeviceDefinition deviceDefinition) {
return false;
}
}

11
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
View File

@@ -1,13 +1,11 @@
package com.openhis.workflow.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.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -59,7 +57,7 @@ public class ActivityDefinition extends HisBaseEntity {
private Integer ybMatchFlag;
/** 状态 */
private Integer statusEnum;
private PublicationStatus statusEnum;
/** 身体部位 */
private String bodySiteCode;
@@ -68,10 +66,9 @@ public class ActivityDefinition extends HisBaseEntity {
private String specimenCode;
/** 说明 */
private String description;
private String descriptionText;
/** 规则id */
private Integer ruleId;
}

15
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
View File

@@ -11,4 +11,19 @@ import com.openhis.workflow.domain.ActivityDefinition;
*/
public interface IActivityDefinitionService extends IService<ActivityDefinition> {
/**
* 新增诊疗目录
*
* @param activityDefinition 诊疗目录实体
* @return
*/
boolean addDiagnosisTreatment(ActivityDefinition activityDefinition);
/**
* 新增医保诊疗目录
*
* @param activityDefinition 诊疗目录实体
* @return
*/
boolean addYbDiagnosisTreatment(ActivityDefinition activityDefinition);
}

43
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
View File

@@ -1,19 +1,58 @@
package com.openhis.workflow.service.impl;
import org.springframework.stereotype.Service;
import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.workflow.domain.ActivityDefinition;
import com.openhis.workflow.mapper.ActivityDefinitionMapper;
import com.openhis.workflow.service.IActivityDefinitionService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 诊疗定义管理Service业务层处理
*
* @author system
* @date 2025-02-20
*/
@Slf4j
@Service
public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitionMapper, ActivityDefinition> implements IActivityDefinitionService {
@AllArgsConstructor
public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitionMapper, ActivityDefinition>
implements IActivityDefinitionService {
private final ActivityDefinitionMapper activityDefinitionMapper;
/**
* 增加外来诊疗项目
*
* @param activityDefinition 诊疗项目实体
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean addDiagnosisTreatment(ActivityDefinition activityDefinition) {
// 根据诊疗编码判断诊疗项目是否存在
List<ActivityDefinition> activityDefinitions =
activityDefinitionMapper.selectList(new LambdaQueryWrapper<ActivityDefinition>()
.eq(ActivityDefinition::getBusNo, activityDefinition.getBusNo()));
if (activityDefinitions.size() > 0) {
return false;
}
// 新增诊疗项目
int insert = activityDefinitionMapper.insert(activityDefinition);
if (insert != 1) {
return false;
}
return true;
}
@Override
public boolean addYbDiagnosisTreatment(ActivityDefinition activityDefinition) {
return false;
}
}