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

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

Browse Source
This commit is contained in:
Zhang.YC
2025-02-27 09:09:03 +08:00
parent e289f08ec8 06a743d182
commit be0d9bc987
52 changed files with 2196 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java
View File

@@ -69,6 +69,7 @@ public class CabinetLocationController {
// 设置排序
queryWrapper.orderByDesc("create_time");
// 执行分页查询并转换为 locationQueryDtoPage
Page<LocationQueryDto> locationQueryDtoPage =
HisPageUtils.selectPage(locationMapper, queryWrapper, pageNo, pageSize, LocationQueryDto.class);
@@ -80,14 +81,16 @@ public class CabinetLocationController {
/**
* 添加库房位置信息
*
* @param locationQueryDto 位置信息
* @param locationQueryDto 库房位置信息
*/
@PostMapping("/cabinet-location")
public R<?> addLocation(@Validated @RequestBody LocationQueryDto locationQueryDto) {
LocationQueryDto locationQuery = new LocationQueryDto(LocationForm.CABINET);
// 设置为库房
// LocationQueryDto locationQuery = new LocationQueryDto(LocationForm.CABINET);
Location location = new Location();
BeanUtils.copyProperties(locationQuery, location);
locationQueryDto.setFormEnum(LocationForm.CABINET);
BeanUtils.copyProperties(locationQueryDto, location);
boolean saveLocationSuccess = locationService.save(location);
@@ -97,21 +100,21 @@ public class CabinetLocationController {
}
/**
* 获取位置需要编辑的信息
* 获取库房位置需要编辑的信息
*
* @param locationId 位置信息
* @param locationId 库房位置信息Id
*/
@GetMapping("/cabinet-location-editById")
@GetMapping("/cabinet-location-getById")
public R<?> getLocationById(@Validated @RequestParam Long locationId) {
Location location = locationService.getById(locationId);
return R.ok(location, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"位置信息"}));
return R.ok(location, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"位置信息"}));
}
/**
* 编辑位置信息
* 编辑库房位置信息
*
* @param location 位置信息
* @param location 库房位置信息
*/
@PutMapping("/cabinet-location")
public R<?> editLocation(@Validated @RequestBody Location location) {
@@ -124,9 +127,9 @@ public class CabinetLocationController {
}
/**
* 删除位置信息
* 删除库房位置信息
*
* @param locationId 主表id
* @param locationId 库房位置信息Id
*/
@DeleteMapping("/cabinet-location")
public R<?> deleteLocation(@RequestParam Long locationId) {

35
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
View File

@@ -125,11 +125,11 @@ public class OrganizationController {
*
* @param orgId 机构信息
*/
@GetMapping("/organization-editById")
@GetMapping("/organization-getById")
public R<?> getOrganizationById(@Validated @RequestParam Long orgId) {
Organization organization = organizationService.getById(orgId);
return R.ok(organization, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"机构信息"}));
return R.ok(organization, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"}));
}
/**
@@ -171,18 +171,33 @@ public class OrganizationController {
}
/**
* 停用启用
* 启用
*
* @param orgId 主表id
* @param orgId 启用数据的Id
*/
@PutMapping("/organization-flag")
public R<?> changeOrgFlag(@RequestParam Long orgId) {
@PutMapping("/organization-active")
public R<?> changeActive(@RequestParam Long orgId) {
boolean flagChangeSuccess = organizationService.changeOrgFlag(orgId);
boolean activeSuccess = organizationService.activeChange(orgId);
return flagChangeSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"机构活动标识"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"机构活动标识"}));
return activeSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"启用"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"启用"}));
}
/**
* 停用
*
* @param orgId 停用数据的Id
*/
@PutMapping("/organization-inactive")
public R<?> changeInactive(@RequestParam Long orgId) {
boolean inActiveSuccess = organizationService.activeChange(orgId);
return inActiveSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"停用"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"停用"}));
}
/**

172
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java Normal file
View File

@@ -0,0 +1,172 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.controller;
import java.util.Arrays;
import java.util.HashSet;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.Location;
import com.openhis.administration.domain.OrganizationLocation;
import com.openhis.administration.mapper.OrganizationLocationMapper;
import com.openhis.administration.service.ILocationService;
import com.openhis.administration.service.IOrganizationLocationService;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.basedatamanage.dto.OrgLocInitDto;
import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 机构位置关系controller
*
* @author
* @date 2025-02-25
*/
@RestController
@RequestMapping("/basedatamanage/org-loc")
@Slf4j
@AllArgsConstructor
public class OrganizationLocationController {
@Autowired
private final IOrganizationLocationService organizationLocationService;
@Autowired
private IOrganizationService organizationService;
@Autowired
private ILocationService locationService;
@Autowired
private OrganizationLocationMapper organizationLocationMapper;
/**
* 机构位置关系初始化
*
*/
@GetMapping(value = "/init")
public R<?> init() {
OrgLocInitDto initDto = new OrgLocInitDto();
// 设置科室列表
initDto.setOrganization(organizationService.list())
// 设置药库列表
.setLocation(locationService.list(new LambdaQueryWrapper<Location>().in(Location::getFormEnum, 11)));
return R.ok(initDto);
}
/**
* 机构位置关系分页列表
*
* @param orgLocQueryParam 查询字段
* @param searchKey 模糊查询关键字
* @param pageNo 当前页码
* @param pageSize 查询条数
* @param request 请求数据
* @return 机构位置关系分页列表
*/
@GetMapping(value = "/org-loc")
public R<?> getOrgLocPage(OrgLocQueryParam orgLocQueryParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<OrganizationLocation> queryWrapper = HisQueryUtils.buildQueryWrapper(orgLocQueryParam, searchKey,
new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request);
// 设置排序
queryWrapper.orderByDesc("create_time");
// 执行分页查询并转换为 orgLocQueryDtoPage
Page<OrgLocQueryDto> orgLocQueryDtoPage =
HisPageUtils.selectPage(organizationLocationMapper, queryWrapper, pageNo, pageSize, OrgLocQueryDto.class);
return R.ok(orgLocQueryDtoPage,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"}));
}
/**
* 添加机构位置关系信息
*
* @param orgLocQueryDto 机构位置关系信息
*/
@PostMapping("/org-loc")
public R<?> addOrgLoc(@Validated @RequestBody OrgLocQueryDto orgLocQueryDto) {
// 新增organizationLocation信息
OrganizationLocation orgLoc = new OrganizationLocation();
BeanUtils.copyProperties(orgLocQueryDto, orgLoc);
boolean saveOrgLocSuccess = organizationLocationService.save(orgLoc);
return saveOrgLocSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"机构位置关系信息"}))
: R.fail(PromptMsgConstant.Common.M00007, null);
}
/**
* 获取机构位置关系需要编辑的信息
*
* @param orgLocId 机构位置关系信息
*/
@GetMapping("/org-loc-getById")
public R<?> getOrgLocById(@Validated @RequestParam Long orgLocId) {
OrganizationLocation orgLoc = organizationLocationService.getById(orgLocId);
return R.ok(orgLoc, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构位置关系信息"}));
}
/**
* 编辑机构位置关系信息
*
* @param orgLocQueryDto 机构位置关系信息
*/
@PutMapping("/org-loc")
public R<?> editOrgLoc(@Validated @RequestBody OrgLocQueryDto orgLocQueryDto) {
// 编辑organizationLocation信息
OrganizationLocation orgLoc = new OrganizationLocation();
BeanUtils.copyProperties(orgLocQueryDto, orgLoc);
boolean editOrgLocSuccess = organizationLocationService.updateById(orgLoc);
return editOrgLocSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"机构位置关系信息"}))
: R.fail(PromptMsgConstant.Common.M00007, null);
}
/**
* 删除机构位置关系信息
*
* @param orgLocId 主表id
*/
@DeleteMapping("/org-loc")
public R<?> delOrgLoc(@RequestParam Long orgLocId) {
boolean delOrgLocSuccess = organizationLocationService.removeById(orgLocId);
return delOrgLocSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"机构位置关系信息"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"机构位置关系信息"}));
}
}

146
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java Normal file
View File

@@ -0,0 +1,146 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.controller;
import java.util.Arrays;
import java.util.HashSet;
import javax.servlet.http.HttpServletRequest;
import com.openhis.administration.domain.Organization;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.PractitionerRole;
import com.openhis.administration.mapper.PractitionerRoleMapper;
import com.openhis.administration.service.IPractitionerRoleService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 岗位管理Controller业务层处理
*
* @author
* @date 2025-02-21
*/
@RestController
@RequestMapping("/basedatamanage/practitioner-role")
@Slf4j
@AllArgsConstructor
public class PractitionerRoleController {
private final IPractitionerRoleService practitionerRoleService;
@Autowired
private PractitionerRoleMapper practitionerRoleMapper;
/**
* 岗位分页列表
*
* @param practRoleSearchParam 查询条件
* @param pageNo 当前页码
* @param pageSize 查询条数
* @param request 请求数据
* @return 岗位分页列表
*/
@GetMapping(value = "/practitioner-role")
public R<?> getPractitionerRolePage(PractRoleSearchParam practRoleSearchParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<PractitionerRole> queryWrapper = HisQueryUtils.buildQueryWrapper(practRoleSearchParam, searchKey,
new HashSet<>(Arrays.asList("name")), request);
// 设置排序
queryWrapper.orderByDesc("create_time");
// 执行分页查询并转换为 practitionerRoleDtoPage
Page<PractitionerRoleDto> practitionerRoleDtoPage =
HisPageUtils.selectPage(practitionerRoleMapper, queryWrapper, pageNo, pageSize, PractitionerRoleDto.class);
return R.ok(practitionerRoleDtoPage,
MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"}));
}
/**
* 添加岗位信息
*
* @param practitionerRoleDto 岗位信息
*/
@PostMapping("/practitioner-role")
public R<?> addPractitionerRole(@Validated @RequestBody PractitionerRoleDto practitionerRoleDto) {
// 新增practitionerRole信息
PractitionerRole practitionerRole = new PractitionerRole();
BeanUtils.copyProperties(practitionerRoleDto, practitionerRole);
boolean savePractitionerRoleSuccess = practitionerRoleService.save(practitionerRole);
return savePractitionerRoleSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"岗位信息"}))
: R.fail(PromptMsgConstant.Common.M00007, null);
}
/**
* 获取岗位需要编辑的信息
*
* @param proleId 岗位信息
*/
@GetMapping("/practitioner-role-getById")
public R<?> getPractitionerRoleById(@Validated @RequestParam Long proleId) {
PractitionerRole practitionerRole = practitionerRoleService.getById(proleId);
return R.ok(practitionerRole, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"岗位信息"}));
}
/**
* 编辑岗位信息
*
* @param practitionerRoleDto 岗位信息
*/
@PutMapping("/practitioner-role")
public R<?> editPractitionerRole(@Validated @RequestBody PractitionerRoleDto practitionerRoleDto) {
// 编辑practitionerRole信息
PractitionerRole practitionerRole = new PractitionerRole();
BeanUtils.copyProperties(practitionerRoleDto, practitionerRole);
boolean editPractitionerRoleSuccess = practitionerRoleService.updateById(practitionerRole);
return editPractitionerRoleSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"岗位信息"}))
: R.fail(PromptMsgConstant.Common.M00007, null);
}
/**
* 删除岗位信息
*
* @param prId 主表id
*/
@DeleteMapping("/practitioner-role")
public R<?> deletePractitionerRole(@RequestParam Long prId) {
boolean deletePractitionerRoleSuccess = practitionerRoleService.removeById(prId);
return deletePractitionerRoleSuccess
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"岗位信息"}))
: R.fail(PromptMsgConstant.Common.M00006, null);
}
}

17
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java
View File

@@ -5,7 +5,10 @@ package com.openhis.web.basedatamanage.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.openhis.common.enums.*;
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.experimental.Accessors;
@@ -58,10 +61,10 @@ public class LocationQueryDto {
/** 显示顺序 */
private Integer displayOrder;
// public LocationQueryDto(LocationForm form, String busNo, LocationMode mode) {
public LocationQueryDto(LocationForm form) {
this.statusEnum = LocationStatus.ACTIVE;
this.formEnum = form;
// this.modeEnum = mode;
}
// public LocationQueryDto(LocationForm form, String busNo, LocationMode mode) {
// public LocationQueryDto(LocationForm form) {
// this.statusEnum = LocationStatus.ACTIVE;
// this.formEnum = form;
// this.modeEnum = mode;
// }
}

30
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.dto;
import java.io.Serializable;
import java.util.List;
import com.openhis.administration.domain.Location;
import com.openhis.administration.domain.Organization;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 科室位置关系初始化 dto
*
* @author
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class OrgLocInitDto implements Serializable {
/** 机构科室信息 */
private List<Organization> organization;
/** 位置药房信息 */
private List<Location> location;
}

47
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.dto;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @author
* @date 2025-02-21
*/
@Data
@Accessors(chain = true)
public class OrgLocQueryDto {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 机构编码 */
private Long organizationId;
/** 位置编码 */
private Long locationId;
/** 默认药房 */
private Long defLocationId;
/** 药品类别 */
private String medCategoryCode;
/** 开始时间 */
private Date startTime;
/** 结束时间 */
private Date endTime;
/** 显示顺序 */
private Integer displayOrder;
}

24
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java Normal file
View File

@@ -0,0 +1,24 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.dto;
import java.io.Serializable;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 科室分页查询条件
*
* @author
* @date 2025-02-21
*/
@Data
@Accessors(chain = true)
public class OrgLocQueryParam implements Serializable {
/** 活动标识 */
private Integer activeFlag;
}

1
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
View File

@@ -3,7 +3,6 @@
*/
package com.openhis.web.basedatamanage.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.experimental.Accessors;

30
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.dto;
import java.io.Serializable;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 岗位分页查询条件
*
* @author
* @date 2025-02-21
*/
@Data
@Accessors(chain = true)
public class PractRoleSearchParam implements Serializable {
/** 名称 */
private String name;
/** 专业编码枚举 */
private Integer specialtyEnum;
/** 机构 */
private Long orgId;
}

53
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.basedatamanage.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* @author
* @date 2025-02-21
*/
@Data
@Accessors(chain = true)
public class PractitionerRoleDto {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 名称 */
private String name;
/** 角色编码 */
private String role_code;
/** 活动标识 */
private Integer activeFlag;
/** 参与者Id */
private Long practitionerId;
/** 机构 */
private Long orgId;
/** 位置ID */
private Long locationId;
/** 服务id */
private Long healthcareServiceId;
/** 专业编码枚举 */
private Integer specialtyEnum;
/** 岗位类型 */
private String typeCode;
/** 有效时间 */
private String availabilityJson;
}

34
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
View File

@@ -6,22 +6,25 @@ package com.openhis.web.basicservice.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.ChargeItemDefinition;
import com.openhis.administration.domain.HealthcareService;
import com.openhis.administration.domain.Location;
import com.openhis.administration.mapper.LocationMapper;
import com.openhis.administration.service.IChargeItemDefinitionService;
import com.openhis.administration.service.IHealthcareServiceService;
import com.openhis.common.enums.AccountStatus;
import com.openhis.common.enums.WhetherContainUnknown;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.medication.domain.Medication;
import com.openhis.medication.domain.MedicationQueryDto;
import com.openhis.web.basicservice.dto.HealthcareServiceAddOrUpdateParam;
import com.openhis.web.basicservice.dto.HealthcareServiceInitDto;
import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.HashSet;
@@ -39,6 +42,9 @@ import java.util.stream.Stream;
public class HealthcareServiceController {
private final IHealthcareServiceService iHealthcareServiceService;
private final IChargeItemDefinitionService iChargeItemDefinitionService;
private final HealthcareServiceBizMapper healthcareServiceBizMapper;
private final LocationMapper locationMapper;
@@ -66,8 +72,28 @@ public class HealthcareServiceController {
.map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName()))
.collect(Collectors.toList());
healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);
// 是否需要预约
List<HealthcareServiceInitDto.appointmentRequiredFlagOption> appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values())
.map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo()))
.collect(Collectors.toList());
healthcareServiceInitDto.setAppointmentRequiredFlagOptions(appointmentRequiredFlagOptions);
return R.ok(healthcareServiceInitDto);
}
/**
* 服务管理 新增
*/
@PostMapping(value = "/healthcare-service")
public R<?> add(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam){
// 服务管理-表单数据
HealthcareService healthcareServiceFormData = healthcareServiceAddOrUpdateParam.getHealthcareServiceFormData();
// 费用定价-表单数据
ChargeItemDefinition chargeItemDefinitionFormData = healthcareServiceAddOrUpdateParam.getChargeItemDefinitionFormData();
// 服务管理-新增
HealthcareService healthcareService = iHealthcareServiceService.addHealthcareService(healthcareServiceFormData);
return null;
}
}

25
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java Normal file
View File

@@ -0,0 +1,25 @@
package com.openhis.web.basicservice.dto;
import com.openhis.administration.domain.ChargeItemDefinition;
import com.openhis.administration.domain.HealthcareService;
import lombok.Data;
/**
* 服务项目管理 新增修改参数类
*
* @author system
* @date 2025-02-20
*/
@Data
public class HealthcareServiceAddOrUpdateParam{
/**
* 服务管理
*/
private HealthcareService healthcareServiceFormData;
/**
* 费用定价
*/
private ChargeItemDefinition chargeItemDefinitionFormData;
}

15
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
View File

@@ -15,6 +15,7 @@ public class HealthcareServiceInitDto {
private List<activeFlagOption> activeFlagOptions;
private List<locationIdOption> locationIdOptions;
private List<appointmentRequiredFlagOption> appointmentRequiredFlagOptions;
/**
@@ -45,4 +46,18 @@ public class HealthcareServiceInitDto {
}
}
/**
* 是否需要预约
*/
@Data
public static class appointmentRequiredFlagOption {
private Integer value;
private String label;
public appointmentRequiredFlagOption(Integer value, String label) {
this.value = value;
this.label = label;
}
}
}

227
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java Normal file
View File

@@ -0,0 +1,227 @@
package com.openhis.web.datadictionary.controller;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.DeviceDefinition;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.mapper.DeviceDefinitionMapper;
import com.openhis.administration.service.IDeviceDefinitionService;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.DeviceCategory;
import com.openhis.common.enums.OrganizationType;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.datadictionary.dto.DeviceManageDto;
import com.openhis.web.datadictionary.dto.DeviceManageInitDto;
import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* TODO:器材目录
*
* @author lpt
* @date 2025-02-20
*/
@RestController
@RequestMapping("/datadictionary/device")
@Slf4j
@AllArgsConstructor
public class DeviceManageController {
private final IDeviceDefinitionService iDeviceDefinitionService;
private final DeviceDefinitionMapper DeviceDefinitionMapper;
private final IOrganizationService iOrganizationService;
/**
* TODO: 器材目录初期查询
*
* @return
*/
@GetMapping("/init")
public R<?> getDeviceManageInit() {
DeviceManageInitDto deviceManageInitDto = new DeviceManageInitDto();
// 获取状态
List<DeviceManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new DeviceManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
deviceManageInitDto.setStatusFlagOptions(statusEnumOptions);
// 获取执行科室
LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
List<Organization> organizations = iOrganizationService.list(queryWrapper);
List<DeviceManageInitDto.exeOrganization> exeOrganizations = organizations.stream()
.map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
.collect(Collectors.toList());
deviceManageInitDto.setExeOrganizations(exeOrganizations);
// 获取分类
List<DeviceManageInitDto.deviceCategory> deviceCategories = Stream.of(DeviceCategory.values())
.map(category -> new DeviceManageInitDto.deviceCategory(category.getValue(), category.getInfo()))
.collect(Collectors.toList());
deviceManageInitDto.setDeviceCategories(deviceCategories);
return R.ok(deviceManageInitDto);
}
/**
* 查询器材目录分页列表
*
* @param DeviceManageSelParam 查询条件
* @param searchKey 查询条件-模糊查询
* @param pageNo 当前页码
* @param pageSize 查询条数
* @return
*/
@GetMapping("/information-page")
public R<?> getDevicePage(DeviceManageSelParam DeviceManageSelParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<DeviceDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(DeviceManageSelParam, searchKey,
new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
// 设置排序
queryWrapper.orderByAsc("bus_no");
// 分页查询
Page<DeviceManageDto> deviceManagePage =
HisPageUtils.selectPage(DeviceDefinitionMapper, queryWrapper, pageNo, pageSize, DeviceManageDto.class);
// 返回【器材目录列表DTO】分页
return R.ok(deviceManagePage);
}
/**
* 根据id查询器材详情
*
* @param id 器材ID
* @return
*/
@GetMapping("/information-one/{id}")
public R<?> getDeviceOne(@PathVariable("id") Long id) {
// 根据ID查询【器材目录】
DeviceDefinition byId = iDeviceDefinitionService.getById(id);
return R.ok(byId);
}
/**
* 器材目录编辑
*
* @param DeviceManageDto 器材目录列表
* @return
*/
@PutMapping("/information")
public R<?> editDevice(@RequestBody DeviceManageUpDto DeviceManageDto) {
DeviceDefinition DeviceDefinition = new DeviceDefinition();
BeanUtils.copyProperties(DeviceManageDto, DeviceDefinition);
// 更新器材信息
return iDeviceDefinitionService.updateById(DeviceDefinition)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 器材目录停用
*
* @param ids 器材目录ID列表
* @return
*/
@PutMapping("/information-stop")
public R<?> editDeviceStop(@RequestBody List<Long> ids) {
List<DeviceDefinition> DeviceDefinitionList = new CopyOnWriteArrayList<>();
// 取得更新值
for (Long detail : ids) {
DeviceDefinition DeviceDefinition = new DeviceDefinition();
DeviceDefinition.setId(detail);
DeviceDefinition.setStatusEnum(PublicationStatus.RETIRED);
DeviceDefinitionList.add(DeviceDefinition);
}
// 更新器材信息
return iDeviceDefinitionService.updateBatchById(DeviceDefinitionList)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 器材目录启用
*
* @param ids 器材目录ID列表
* @return
*/
@PutMapping("/information-start")
public R<?> editDeviceStart(@RequestBody List<Long> ids) {
List<DeviceDefinition> DeviceDefinitionList = new CopyOnWriteArrayList<>();
// 取得更新值
for (Long detail : ids) {
DeviceDefinition DeviceDefinition = new DeviceDefinition();
DeviceDefinition.setId(detail);
DeviceDefinition.setStatusEnum(PublicationStatus.ACTIVE);
DeviceDefinitionList.add(DeviceDefinition);
}
// 更新器材信息
return iDeviceDefinitionService.updateBatchById(DeviceDefinitionList)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 新增外来器材目录
*
* @param DeviceManageUpDto 器材目录
* @return
*/
@PostMapping("/information")
public R<?> addDevice(@Validated @RequestBody DeviceManageUpDto DeviceManageUpDto) {
DeviceDefinition DeviceDefinition = new DeviceDefinition();
BeanUtils.copyProperties(DeviceManageUpDto, DeviceDefinition);
// 新增外来器材目录
DeviceDefinition.setStatusEnum(PublicationStatus.DRAFT);
return iDeviceDefinitionService.addDevice(DeviceDefinition)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
}
/**
* 新增医保器材目录
*
* @param DeviceManageUpDto 器材目录
* @return
*/
@PostMapping("/information-yb")
public R<?> addYbDevice(@RequestBody DeviceManageUpDto DeviceManageUpDto) {
return null;
}
/**
* 器材目录导出
*
* @param DeviceManageDto 器材目录
* @return
*/
@GetMapping("/information-export")
public R<?> exportDevice(@RequestBody DeviceManageDto DeviceManageDto) {
return null;
}
}

226
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java Normal file
View File

@@ -0,0 +1,226 @@
package com.openhis.web.datadictionary.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
import com.openhis.administration.domain.Location;
import com.openhis.common.enums.ConditionDefinitionSource;
import com.openhis.web.basedatamanage.dto.OrganizationQueryDto;
import com.openhis.web.basicservice.dto.HealthcareServiceInitDto;
import com.openhis.web.datadictionary.dto.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.OrganizationType;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
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;
/**
* TODO:诊疗目录
*
* @author lpt
* @date 2025-02-20
*/
@RestController
@RequestMapping("/datadictionary/diagnosistreatment")
@Slf4j
@AllArgsConstructor
public class DiagnosisTreatmentController {
private final IActivityDefinitionService iActivityDefinitionService;
private final ActivityDefinitionMapper activityDefinitionMapper;
private final IOrganizationService iOrganizationService;
/**
* 诊疗目录初期查询
*
* @return
*/
@GetMapping("/init")
public R<?> getDiseaseTreatmentInit() {
DiagnosisTreatmentInitDto diagnosisTreatmentInitDto = new DiagnosisTreatmentInitDto();
// 获取状态
List<DiagnosisTreatmentInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
diagnosisTreatmentInitDto.setStatusFlagOptions(statusEnumOptions);
// 获取执行科室
LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT);
List<Organization> organizations = iOrganizationService.list(queryWrapper);
List<DiagnosisTreatmentInitDto.exeOrganization> exeOrganizations = organizations.stream()
.map(exeOrg -> new DiagnosisTreatmentInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
.collect(Collectors.toList());
diagnosisTreatmentInitDto.setExeOrganizations(exeOrganizations);
// 获取诊疗分类
return R.ok(diagnosisTreatmentInitDto);
}
/**
* 查询诊疗目录分页列表
*
* @param DiagnosisTreatmentSelParam 查询条件
* @param searchKey 查询条件-模糊查询
* @param pageNo 当前页码
* @param pageSize 查询条数
* @return
*/
@GetMapping("/information-page")
public R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<ActivityDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
// 设置排序
queryWrapper.orderByAsc("bus_no");
// 分页查询
Page<DiagnosisTreatmentDto> diseaseTreatmentPage = HisPageUtils.selectPage(activityDefinitionMapper,
queryWrapper, pageNo, pageSize, DiagnosisTreatmentDto.class);
// 返回【诊疗目录列表DTO】分页
return R.ok(diseaseTreatmentPage);
}
/**
* 根据id查询诊疗详情
*
* @param id 诊疗ID
* @return
*/
@GetMapping("/information-one/{id}")
public R<?> getDiseaseTreatmentOne(@PathVariable("id") Long id) {
DiagnosisTreatmentDto diagnosisTreatmentDto = new DiagnosisTreatmentDto();
// 根据ID查询【诊疗目录】
ActivityDefinition activityDefinition = iActivityDefinitionService.getById(id);
BeanUtils.copyProperties(activityDefinition, diagnosisTreatmentDto);
return R.ok(diagnosisTreatmentDto);
}
/**
* 诊疗目录编辑
*
* @param diagnosisTreatmentUpDto 诊疗目录列表
* @return
*/
@PutMapping("/information")
public R<?> editDiseaseTreatment(@RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
ActivityDefinition ActivityDefinition = new ActivityDefinition();
BeanUtils.copyProperties(diagnosisTreatmentUpDto, ActivityDefinition);
// 更新诊疗信息
return iActivityDefinitionService.updateById(ActivityDefinition)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 诊疗目录停用
*
* @param ids 诊疗目录ID列表
* @return
*/
@PutMapping("/information-stop")
public R<?> editDiseaseTreatmentStop(@RequestBody List<Long> ids) {
List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
// 取得更新值
for (Long detail : ids) {
ActivityDefinition ActivityDefinition = new ActivityDefinition();
ActivityDefinition.setId(detail);
ActivityDefinition.setStatusEnum(PublicationStatus.RETIRED);
ActivityDefinitionList.add(ActivityDefinition);
}
// 更新诊疗信息
return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 诊疗目录启用
*
* @param ids 诊疗目录ID列表
* @return
*/
@PutMapping("/information-start")
public R<?> editDiseaseTreatmentStart(@RequestBody List<Long> ids) {
List<ActivityDefinition> ActivityDefinitionList = new CopyOnWriteArrayList<>();
// 取得更新值
for (Long detail : ids) {
ActivityDefinition ActivityDefinition = new ActivityDefinition();
ActivityDefinition.setId(detail);
ActivityDefinition.setStatusEnum(PublicationStatus.ACTIVE);
ActivityDefinitionList.add(ActivityDefinition);
}
// 更新诊疗信息
return iActivityDefinitionService.updateBatchById(ActivityDefinitionList)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
/**
* 新增外来诊疗目录
*
* @param diagnosisTreatmentUpDto 诊疗目录
* @return
*/
@PostMapping("/information")
public R<?> addDiseaseTreatment(@Validated @RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
ActivityDefinition ActivityDefinition = new ActivityDefinition();
BeanUtils.copyProperties(diagnosisTreatmentUpDto, ActivityDefinition);
// 新增外来诊疗目录
ActivityDefinition.setStatusEnum(PublicationStatus.DRAFT);
return iActivityDefinitionService.addDiagnosisTreatment(ActivityDefinition)
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
}
/**
* 新增医保诊疗目录
*
* @param diagnosisTreatmentUpDto 诊疗目录
* @return
*/
@PostMapping("/information-yb")
public R<?> addYbDiseaseTreatment(@RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
return null;
}
/**
* 诊疗目录导出
*
* @param diagnosisTreatmentDto 诊疗目录
* @return
*/
@GetMapping("/information-export")
public R<?> exportDiseaseTreatment(@RequestBody DiagnosisTreatmentDto diagnosisTreatmentDto) {
return null;
}
}

35
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
View File

@@ -1,10 +1,11 @@
package com.openhis.web.datadictionary.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
@@ -25,9 +26,9 @@ import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.datadictionary.dto.DiseaseManageDto;
import com.openhis.web.datadictionary.dto.DiseaseManageInitDto;
import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
import com.openhis.web.datadictionary.dto.DiseaseSourceDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -47,24 +48,24 @@ public class DiseaseManageController {
private final ConditionDefinitionMapper conditionDefinitionMapper;
/**
* 病种目录分类查询
*
* 病种目录初始化
*
* @return
*/
@GetMapping("/information-category")
public R<?> getDiseaseCategory() {
@GetMapping("/information-init")
public R<?> getDiseaseInit() {
DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto();
// 获取疾病目录种类
List<ConditionDefinitionSource> statusList = Arrays.asList(ConditionDefinitionSource.values());
List<DiseaseSourceDto> diseaseSourceDtos = new ArrayList<>();
// 取得更新值
for (ConditionDefinitionSource detail : statusList) {
DiseaseSourceDto diseaseSourceDto = new DiseaseSourceDto();
diseaseSourceDto.setCode(detail.getCode());
diseaseSourceDto.setValue(detail.getValue());
diseaseSourceDto.setInfo(detail.getInfo());
diseaseSourceDtos.add(diseaseSourceDto);
}
return R.ok(diseaseSourceDtos);
List<DiseaseManageInitDto.diseaseCategory> diseaseCategoryList = Stream.of(ConditionDefinitionSource.values())
.map(status -> new DiseaseManageInitDto.diseaseCategory(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
diseaseManageInitDto.setDiseaseCategoryList(diseaseCategoryList);
// 获取状态
List<DiseaseManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions);
return R.ok(diseaseManageInitDto);
}
/**

21
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
View File

@@ -2,6 +2,8 @@ package com.openhis.web.datadictionary.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
@@ -21,6 +23,7 @@ import com.openhis.medication.domain.MedicationDetail;
import com.openhis.medication.service.IMedicationDefinitionService;
import com.openhis.medication.service.IMedicationService;
import com.openhis.web.datadictionary.dto.MedicationManageDto;
import com.openhis.web.datadictionary.dto.MedicationManageInitDto;
import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
import com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper;
@@ -44,7 +47,23 @@ public class MedicationManageController {
private final MedicationManageSearchMapper medicationManageSearchMapper;
/**
* 查询病种目录分页列表
* 药品目录初始化
*
* @return
*/
@GetMapping("/information-init")
public R<?> getMedicationInit() {
MedicationManageInitDto medicationManageInitDto = new MedicationManageInitDto();
// 获取状态
List<MedicationManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
.map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
return R.ok(medicationManageInitDto);
}
/**
* 查询药品目录分页列表
*
* @param searchKey 查询条件
* @param statusEnum 查询条件-状态

103
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java Normal file
View File

@@ -0,0 +1,103 @@
package com.openhis.web.datadictionary.dto;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.enums.DeviceCategory;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 器材目录分页检索
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DeviceManageDto {
/** ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 编码 */
private String busNo;
/** 器材名称 */
private String name;
/** 器材名称拼音 */
private String pyStr;
/** 器材五笔拼音 */
private String wbStr;
/** 器材分类 */
private DeviceCategory categoryEnum;
/** 器材种类 */
private String typeCode;
/** 包装单位 */
private String unitCode;
/** 包装规格 */
private String size;
/** 拆零比 */
private BigDecimal partPercent;
/** 最小使用单位 */
private String minUnitCode;
/** 产品型号 */
private String modelNumber;
/** 高值器材标志 */
private Integer hvcmFlag;
/** 销售单位 */
private String salesUnitCode;
/** 批准文号 */
private String approvalNumber;
/** 医保标记 */
private Integer ybFlag;
/** 医保编码 */
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 状态 */
private PublicationStatus statusEnum;
/** 生产厂家 */
private Long manufacturerId;
/** 供应商 */
private Long supplyId;
/** 说明 */
private String description;
/** 适用范围 */
private String jurisdiction;
/** 执行科室 */
private Long ruleId;
/** 器材版本 */
private String version;
/** 主要成分 */
private String substanceText;
/** 过敏标记 */
private Integer allergenFlag;
}

64
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java Normal file
View File

@@ -0,0 +1,64 @@
package com.openhis.web.datadictionary.dto;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 器材目录初始dto
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DeviceManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<deviceCategory> deviceCategories;
private List<exeOrganization> exeOrganizations;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 器材分类
*/
@Data
public static class deviceCategory {
private Integer value;
private String info;
List<deviceCategory> children = new ArrayList<>();
public deviceCategory(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 执行机构
*/
@Data
public static class exeOrganization {
private Long value;
private String label;
public exeOrganization(Long value, String label) {
this.value = value;
this.label = label;
}
}
}

30
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java Normal file
View File

@@ -0,0 +1,30 @@
package com.openhis.web.datadictionary.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 器材目录分页检索条件
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DeviceManageSelParam {
/** 器材分类 */
private Integer categoryEnum;
/** 器材种类 */
private String typeCode;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 状态 */
private Integer statusEnum;
/** 执行科室 */
private Long ruleId;
}

103
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java Normal file
View File

@@ -0,0 +1,103 @@
package com.openhis.web.datadictionary.dto;
import java.math.BigDecimal;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.enums.DeviceCategory;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 器材目录更新
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DeviceManageUpDto {
/** ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 编码 */
@NotBlank(message = "器材编码不能为空")
private String busNo;
/** 器材名称 */
@NotBlank(message = "器材名称不能为空")
private String name;
/** 器材名称拼音 */
private String pyStr;
/** 器材五笔拼音 */
private String wbStr;
/** 器材分类 */
private DeviceCategory categoryEnum;
/** 器材种类 */
private String typeCode;
/** 包装单位 */
private String unitCode;
/** 包装规格 */
private String size;
/** 拆零比 */
private BigDecimal partPercent;
/** 最小使用单位 */
private String minUnitCode;
/** 产品型号 */
private String modelNumber;
/** 高值器材标志 */
private Integer hvcmFlag;
/** 销售单位 */
private String salesUnitCode;
/** 批准文号 */
private String approvalNumber;
/** 医保标记 */
private Integer ybFlag;
/** 医保编码 */
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 生产厂家 */
private Long manufacturerId;
/** 供应商 */
private Long supplyId;
/** 说明 */
private String description;
/** 适用范围 */
private String jurisdiction;
/** 执行科室 */
private Long ruleId;
/** 器材版本 */
private String version;
/** 主要成分 */
private String substanceText;
/** 过敏标记 */
private Integer allergenFlag;
}

67
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java Normal file
View File

@@ -0,0 +1,67 @@
package com.openhis.web.datadictionary.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 诊疗目录分页检索
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiagnosisTreatmentDto {
/** ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 目录类别 */
private Integer categoryEnum;
/** 编码 */
private String busNo;
/** 项目名称 */
private String name;
/** 项目名称拼音 */
private String pyStr;
/** 五笔拼音 */
private String wbStr;
/** 类型 */
private Integer typeEnum;
/** 使用单位 */
private String permittedUnitCode;
/** 医保标记 */
private Integer ybFlag;
/** 医保编码 */
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 状态 */
private PublicationStatus statusEnum;
/** 身体部位 */
private String bodySiteCode;
/** 所需标本 */
private String specimenCode;
/** 说明 */
private String descriptionText;
/** 规则id */
private Integer ruleId;
}

79
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java Normal file
View File

@@ -0,0 +1,79 @@
package com.openhis.web.datadictionary.dto;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 诊疗目录初期查询
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiagnosisTreatmentInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<diseaseTreatmentCategory> diseaseTreatmentCategoryList;
private List<exeOrganization> exeOrganizations;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 诊疗分类
*/
@Data
public static class diseaseTreatmentCategory {
private Integer value;
private String info;
List<diseaseTreatmentType> children = new ArrayList<>();
public diseaseTreatmentCategory(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 诊疗类型
*/
@Data
public static class diseaseTreatmentType {
private Integer value;
private String info;
List<diseaseTreatmentType> children = new ArrayList<>();
public diseaseTreatmentType(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 执行机构
*/
@Data
public static class exeOrganization {
private Long value;
private String label;
public exeOrganization(Long value, String label) {
this.value = value;
this.label = label;
}
}
}

31
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java Normal file
View File

@@ -0,0 +1,31 @@
package com.openhis.web.datadictionary.dto;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 诊疗目录分页检索条件
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiagnosisTreatmentSelParam {
/** 目录类别 */
private Integer categoryEnum;
/** 类型 */
private Integer typeEnum;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 规则id */
private Integer ruleId;
/** 状态 */
private Integer statusEnum;
}

66
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java Normal file
View File

@@ -0,0 +1,66 @@
package com.openhis.web.datadictionary.dto;
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 诊疗目录分页更新
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiagnosisTreatmentUpDto {
/** ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 目录类别 */
private Integer categoryEnum;
/** 编码 */
@NotBlank(message = "项目编码不能为空")
private String busNo;
/** 项目名称 */
@NotBlank(message = "项目名称不能为空")
private String name;
/** 项目名称拼音 */
private String pyStr;
/** 五笔拼音 */
private String wbStr;
/** 类型 */
private Integer typeEnum;
/** 使用单位 */
private String permittedUnitCode;
/** 医保标记 */
private Integer ybFlag;
/** 医保编码 */
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 身体部位 */
private String bodySiteCode;
/** 所需标本 */
private String specimenCode;
/** 说明 */
private String descriptionText;
/** 规则id */
private Integer ruleId;
}

49
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java Normal file
View File

@@ -0,0 +1,49 @@
package com.openhis.web.datadictionary.dto;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 疾病目录初始dto
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiseaseManageInitDto {
private List<statusEnumOption> statusFlagOptions;
private List<diseaseCategory> diseaseCategoryList;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
/**
* 疾病分类
*/
@Data
public static class diseaseCategory {
private Integer value;
private String info;
List<diseaseCategory> children = new ArrayList<>();
public diseaseCategory(Integer value, String info) {
this.value = value;
this.info = info;
}
}
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
View File

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class DiseaseManageSelParam {
/** 所属分类 */
private ConditionDefinitionSource sourceEnum;
private Integer sourceEnum;
/** 状态 */
private PublicationStatus statusEnum;
private Integer statusEnum;
}

23
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseSourceDto.java
View File

@@ -1,23 +0,0 @@
package com.openhis.web.datadictionary.dto;
import com.core.common.core.domain.entity.SysDept;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
/**
* 疾病目录种别dto
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class DiseaseSourceDto {
private Integer value;
private String code;
private String info;
List<DiseaseSourceDto> children = new ArrayList<>();
}

32
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java Normal file
View File

@@ -0,0 +1,32 @@
package com.openhis.web.datadictionary.dto;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 药品目录初始dto
*
* @author lpt
* @date 2025-02-25
*/
@Data
@Accessors(chain = true)
public class MedicationManageInitDto {
private List<statusEnumOption> statusFlagOptions;
/**
* 状态
*/
@Data
public static class statusEnumOption {
private Integer value;
private String info;
public statusEnumOption(Integer value, String info) {
this.value = value;
this.info = info;
}
}
}

3
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
View File

@@ -12,7 +12,8 @@ public enum ConditionDefinitionSource {
DIAGNOSIS_BY_DISEASE_CATALOG(3, "03", "按病种目录付费诊断"),
DAY_SURGERY_TREATMENT_DISEASE(4, "04", "日间手术治疗病种"),
TRADITIONAL_CHINESE_MEDICINE_DIAGNOSIS(5, "05", "中医诊断"),
TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG(6, "06", "中医证候目录");
TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG(6, "06", "中医证候目录"),
TUMOR_MORPHOLOGY_CATALOG(7, "07", "肿瘤形态学目录");
@EnumValue
private final Integer value;
private final String code;

20
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java Normal file
View File

@@ -0,0 +1,20 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 是否
*/
@Getter
@AllArgsConstructor
public enum WhetherContainUnknown {
NO(0, "no", "否"),
YES(1, "yes", "是"),
UNKNOWN(2, "unknown", "未知");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

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

52
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java Normal file
View File

@@ -0,0 +1,52 @@
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;
/**
* 机构位置关系管理Entity实体
*
* @author system
* @date 2025-02-22
*/
@Data
@TableName("adm_organization_location")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class OrganizationLocation extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 机构编码 */
private Long organizationId;
/** 位置编码 */
private Long locationId;
/** 默认药房 */
private Long defLocationId;
/** 药品类别 */
private String medCategoryCode;
/** 开始时间 */
private Date startTime;
/** 结束时间 */
private Date endTime;
/** 显示顺序 */
private Integer displayOrder;
}

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

@@ -0,0 +1,17 @@
package com.openhis.administration.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.OrganizationLocation;
/**
* 机构位置关系管理Mapper接口
*
* @author system
* @date 2025-02-22
*/
@Repository
public interface OrganizationLocationMapper extends BaseMapper<OrganizationLocation> {
}

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

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

@@ -11,4 +11,6 @@ import com.openhis.administration.domain.HealthcareService;
*/
public interface IHealthcareServiceService extends IService<HealthcareService> {
HealthcareService addHealthcareService(HealthcareService healthcareService);
}

12
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java Normal file
View File

@@ -0,0 +1,12 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.OrganizationLocation;
/**
* 机构位置关系管理Service接口
*
* @author system
* @date 2025-02-25
*/
public interface IOrganizationLocationService extends IService<OrganizationLocation> {}

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

@@ -10,5 +10,5 @@ import com.openhis.administration.domain.Organization;
* @date 2025-02-21
*/
public interface IOrganizationService extends IService<Organization> {
boolean changeOrgFlag(Long orgId);
boolean activeChange(Long orgId);
}

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

6
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
View File

@@ -16,4 +16,10 @@ import com.openhis.administration.service.IHealthcareServiceService;
@Service
public class HealthcareServiceServiceImpl extends ServiceImpl<HealthcareServiceMapper, HealthcareService> implements IHealthcareServiceService {
@Override
public HealthcareService addHealthcareService(HealthcareService healthcareService){
baseMapper.insert(healthcareService);
return healthcareService;
}
}

20
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.openhis.administration.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.OrganizationLocation;
import com.openhis.administration.mapper.OrganizationLocationMapper;
import com.openhis.administration.service.IOrganizationLocationService;
/**
* 机构位置关系管理Service业务层处理
*
* @author system
* @date 2025-02-25
*/
@Service
public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLocationMapper, OrganizationLocation>
implements IOrganizationLocationService {
}

25
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
View File

@@ -23,20 +23,25 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
private OrganizationMapper organizationMapper;
@Override
public boolean changeOrgFlag(Long orgId) {
public boolean activeChange(Long orgId) {
if (orgId != null) {
Organization organization = organizationMapper.selectById(orgId);
if (organization.getActiveFlag().equals(AccountStatus.ACTIVE.getValue())) {
organization.setActiveFlag(AccountStatus.INACTIVE.getValue());
return true;
} else {
organization.setActiveFlag(AccountStatus.ACTIVE.getValue());
if (organization != null) {
Integer activeFlag = organization.getActiveFlag();
switch (activeFlag ) {
case 1:
organization.setActiveFlag(AccountStatus.INACTIVE.getValue());
break;
case 2:
organization.setActiveFlag(AccountStatus.ACTIVE.getValue());
break;
default:
return false;
}
organizationMapper.updateById(organization);
return true;
}
} else {
return false;
}
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;
}
}

7
openhis-server/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.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.administration.mapper.OrganizationLocationMapper">
</mapper>