diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/ILocationAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/ILocationAppServiceImpl.java index 2c7f64c9..995e6554 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/ILocationAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/ILocationAppServiceImpl.java @@ -5,6 +5,9 @@ import java.util.stream.Collectors; import javax.annotation.Resource; +import com.openhis.common.enums.LocationBedStatus; +import com.openhis.common.enums.LocationMode; +import com.openhis.common.enums.LocationStatus; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -42,6 +45,12 @@ public class ILocationAppServiceImpl implements ILocationAppService { locationQueryDtoPage.getRecords().forEach(e -> { // 物理形式枚举回显赋值 e.setFormEnum_enumText(EnumUtils.getInfoByValue(LocationForm.class, e.getFormEnum())); + // 状态编码回显赋值 + e.setStatusEnum_enumText(EnumUtils.getInfoByValue(LocationStatus.class, e.getStatusEnum())); + // 操作状态回显赋值 + e.setOperationalEnum_enumText(EnumUtils.getInfoByValue(LocationBedStatus.class, e.getOperationalEnum())); + // 模式编码回显赋值 + e.setModeEnum_enumText(EnumUtils.getInfoByValue(LocationMode.class, e.getModeEnum())); }); return locationQueryDtoPage; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java index 19a18e64..d9ac2ed0 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java @@ -72,10 +72,10 @@ public class CabinetLocationController { // locationQueryDto.setFormEnum(LocationForm.CABINET); // BeanUtils.copyProperties(locationQueryDto, location); Location location = new Location(locationQueryDto.getId(), locationQueryDto.getBusNo(), - locationQueryDto.getName(), LocationStatus.ACTIVE, LocationBedStatus.U, LocationMode.INSTANCE, - locationQueryDto.getTypeCode(), locationQueryDto.getTypeJson(), locationQueryDto.getPyStr(), - locationQueryDto.getWbStr(), LocationForm.CABINET.getValue(), locationQueryDto.getOrganizationId(), - locationQueryDto.getDisplayOrder()); + locationQueryDto.getName(), LocationStatus.ACTIVE.getValue(), LocationBedStatus.U.getValue(), + LocationMode.INSTANCE.getValue(), locationQueryDto.getTypeCode(), locationQueryDto.getTypeJson(), + locationQueryDto.getPyStr(), locationQueryDto.getWbStr(), LocationForm.CABINET.getValue(), + locationQueryDto.getOrganizationId(), locationQueryDto.getDisplayOrder()); boolean saveLocationSuccess = locationService.save(location); return saveLocationSuccess @@ -104,10 +104,10 @@ public class CabinetLocationController { public R editLocation(@Validated @RequestBody LocationQueryDto locationQueryDto) { Location location = new Location(locationQueryDto.getId(), locationQueryDto.getBusNo(), - locationQueryDto.getName(), LocationStatus.ACTIVE, LocationBedStatus.U, LocationMode.INSTANCE, - locationQueryDto.getTypeCode(), locationQueryDto.getTypeJson(), locationQueryDto.getPyStr(), - locationQueryDto.getWbStr(), LocationForm.CABINET.getValue(), locationQueryDto.getOrganizationId(), - locationQueryDto.getDisplayOrder()); + locationQueryDto.getName(), LocationStatus.ACTIVE.getValue(), LocationBedStatus.U.getValue(), + LocationMode.INSTANCE.getValue(), locationQueryDto.getTypeCode(), locationQueryDto.getTypeJson(), + locationQueryDto.getPyStr(), locationQueryDto.getWbStr(), LocationForm.CABINET.getValue(), + locationQueryDto.getOrganizationId(), locationQueryDto.getDisplayOrder()); boolean updateLocationSuccess = locationService.updateById(location); return updateLocationSuccess diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java new file mode 100644 index 00000000..d401d6d8 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java @@ -0,0 +1,175 @@ +/* + * 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.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.Practitioner; +import com.openhis.administration.domain.PractitionerRole; +import com.openhis.administration.mapper.PractitionerMapper; +import com.openhis.administration.mapper.PractitionerRoleMapper; +import com.openhis.administration.service.IPractitionerService; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.AccountStatus; +import com.openhis.common.enums.AdministrativeGender; +import com.openhis.common.utils.EnumUtils; +import com.openhis.common.utils.HisPageUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.basedatamanage.dto.PractSearchParam; +import com.openhis.web.basedatamanage.dto.PractitionerDto; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * 员工管理Controller业务层处理 + * + * @author + * @date 2025-02-21 + */ +@RestController +@RequestMapping("/basedatamanage/practitioner") +@Slf4j +@AllArgsConstructor +public class PractitionerController { + + private final IPractitionerService practitionerService; + + @Autowired + private PractitionerMapper practitionerMapper; + + @Autowired + private PractitionerRoleMapper practitionerRoleMapper; + + /** + * 员工分页列表 + * + * @param practSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 员工分页列表 + */ + @GetMapping(value = "/practitioner") + public R getPractitionerPage(PractSearchParam practSearchParam, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(practSearchParam, searchKey, + new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request); + + // 设置排序 + queryWrapper.orderByDesc("name"); + + // 执行分页查询并转换为 practitionerDtoPage + Page practitionerDtoPage = + HisPageUtils.selectPage(practitionerMapper, queryWrapper, pageNo, pageSize, PractitionerDto.class); + + practitionerDtoPage.getRecords().forEach(e -> { + // 性别回显赋值 + e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); + }); + + return R.ok(practitionerDtoPage, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"员工信息"})); + + } + + /** + * 添加员工信息 + * + * @param practitionerDto 员工信息 + */ + @PostMapping("/practitioner") + public R addPractitioner(@Validated @RequestBody PractitionerDto practitionerDto) { + + // 新增practitioner信息 + Practitioner practitioner = new Practitioner(); + BeanUtils.copyProperties(practitionerDto, practitioner); + practitioner.setActiveFlag(AccountStatus.ACTIVE.getValue()); + + boolean savePractitionerSuccess = practitionerService.save(practitioner); + + PractitionerRole practitionerRole = new PractitionerRole(); + practitionerRole.setPractitionerId(practitioner.getId()); + practitionerRole.setName(practitioner.getName()); + Integer saveProleSuccess = practitionerRoleMapper.insert(practitionerRole); + + boolean saveFlag; + if (savePractitionerSuccess && saveProleSuccess == 1) { + saveFlag = true; + } else { + saveFlag = false; + } + + return saveFlag ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"员工信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"员工信息"})); + } + + /** + * 获取员工需要编辑的信息 + * + * @param practitionerId 员工信息 + */ + @GetMapping("/practitioner-getById") + public R getPractitionerById(@Validated @RequestParam Long practitionerId) { + + Practitioner practitioner = practitionerService.getById(practitionerId); + if (practitioner != null) { + return R.ok(practitioner, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"员工信息"})); + } else { + return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"员工信息查新失败"})); + } + } + + /** + * 编辑员工信息 + * + * @param practitionerDto 员工信息 + */ + @PutMapping("/practitioner") + public R editPractitioner(@Validated @RequestBody PractitionerDto practitionerDto) { + + // 编辑practitioner信息 + Practitioner practitioner = new Practitioner(); + BeanUtils.copyProperties(practitionerDto, practitioner); + + boolean editPractitionerSuccess = practitionerService.updateById(practitioner); + + return editPractitionerSuccess + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"员工信息"})) + : R.fail(PromptMsgConstant.Common.M00007, null); + } + + /** + * 删除员工信息 + * + * @param practitionerId 主表id + */ + @DeleteMapping("/practitioner") + public R deletePractitioner(@RequestParam Long practitionerId) { + + boolean delPractitionerSuccess = practitionerService.removeById(practitionerId); + + return delPractitionerSuccess + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"员工信息"})) + : R.fail(PromptMsgConstant.Common.M00006, null); + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java index 700a66dc..198cd26f 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java @@ -8,7 +8,6 @@ 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; @@ -78,24 +77,24 @@ public class PractitionerRoleController { } - /** - * 添加岗位信息 - * - * @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 practitionerRoleDto 岗位信息 + // */ + // @PostMapping("/practitioner-role") + // public R addPractitionerRole(@Validated @RequestBody CreatePractitionerRoleDto 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); + // } /** * 获取岗位需要编辑的信息 @@ -106,7 +105,8 @@ public class PractitionerRoleController { public R getPractitionerRoleById(@Validated @RequestParam Long proleId) { PractitionerRole practitionerRole = practitionerRoleService.getById(proleId); - return R.ok(practitionerRole, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"岗位信息"})); + return R.ok(practitionerRole, + MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"岗位信息"})); } /** @@ -120,6 +120,15 @@ public class PractitionerRoleController { // 编辑practitionerRole信息 PractitionerRole practitionerRole = new PractitionerRole(); BeanUtils.copyProperties(practitionerRoleDto, practitionerRole); + if (practitionerRole.getRole_code() == null) { + return R.fail(PromptMsgConstant.Common.M00007, "角色编码不能为空"); + } + if (practitionerRole.getOrgId() == null) { + return R.fail(PromptMsgConstant.Common.M00007, "科室不能为空"); + } + if (practitionerRole.getLocationId() == null) { + return R.fail(PromptMsgConstant.Common.M00007, "位置不能为空"); + } boolean editPractitionerRoleSuccess = practitionerRoleService.updateById(practitionerRole); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java index 91e55abd..750dcf5e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java @@ -39,15 +39,21 @@ public class LocationQueryDto { /** 状态编码 */ @NotNull(message = "状态编码不能为空") - private LocationStatus statusEnum; +// private LocationStatus statusEnum; + private Integer statusEnum; + private String statusEnum_enumText; /** 操作状态 */ @NotNull(message = "操作状态不能为空") - private LocationBedStatus operationalEnum; +// private LocationBedStatus operationalEnum; + private Integer operationalEnum; + private String operationalEnum_enumText; /** 模式编码 */ @NotNull(message = "模式编码不能为空") - private LocationMode modeEnum; +// private LocationMode modeEnum; + private Integer modeEnum; + private String modeEnum_enumText; /** 模式编码 */ private String typeCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java index acf2d759..033422e3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java @@ -18,9 +18,6 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class PractRoleSearchParam implements Serializable { - /** 名称 */ - private String name; - /** 专业编码枚举 */ private Integer specialtyEnum; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java new file mode 100644 index 00000000..b4374f5e --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java @@ -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 PractSearchParam implements Serializable { + + /** 活动标记 */ + private Integer activeFlag; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java new file mode 100644 index 00000000..cf8f6ed5 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java @@ -0,0 +1,79 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.basedatamanage.dto; + +import java.util.Date; + +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 + * @date 2025-02-21 + */ +@Data +@Accessors(chain = true) +public class PractitionerDto { + + /** 姓名 */ + @NotBlank(message = "姓名不能为空") + private String name; + + /** 其他名称 */ + private String nameJson; + + /** 性别编码 */ + // @NotBlank(message = "性别不能为空") + // private AdministrativeGender genderEnum; + private Integer genderEnum; + private String genderEnum_enumText; + + /** 生日 */ + private Date birthDate; + + /** 死亡时间 */ + private Date deceasedDate; + + /** 电话 */ + private String phone; + + /** 地址 */ + private String address; + + /** 地址省 */ + private String addressProvince; + + /** 地址市 */ + private String addressCity; + + /** 地址区 */ + private String addressDistrict; + + /** 地址街道 */ + private String addressStreet; + + /** 患者其他地址 */ + private String addressJson; + + /** 拼音码 */ + private String pyStr; + + /** 五笔码 */ + private String wbStr; + + /** 患者院内编码/病历号 */ + private String busNo; + + /** 医保码 */ + private String ybNo; + + /** 系统用户id */ + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java deleted file mode 100644 index 16230063..00000000 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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; -} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java index 9344291d..9d7fa710 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java @@ -15,6 +15,7 @@ import javax.validation.constraints.NotBlank; * @author lpt * @date 2025-02-25 */ + @Data @Accessors(chain = true) public class DiseaseManageUpDto { diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java index 87829b40..b0374396 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java @@ -1,18 +1,20 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; + import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public enum LocationBedStatus { - C (1, "C", "关闭"), - H (2, "H", "整理"), - O (3, "O", "占用"), - U (4, "U", "空闲"), - K (5, "K", "污染"), - I (6, "I", "隔离"); +public enum LocationBedStatus implements HisEnumInterface { + C(1, "C", "关闭"), + H(2, "H", "整理"), + O(3, "O", "占用"), + U(4, "U", "空闲"), + K(5, "K", "污染"), + I(6, "I", "隔离"); + @EnumValue private final Integer value; private final String code; diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java index 6ab2fe9e..2ba12c82 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java @@ -1,13 +1,14 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; + import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public enum LocationMode { - INSTANCE (1, "instance", "具体"), +public enum LocationMode implements HisEnumInterface { + INSTANCE(1, "instance", "具体"), KIND(2, "Kind", "种类"); diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java index 7ddd2bc0..263aa88c 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java @@ -1,17 +1,19 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; + import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public enum LocationStatus { - ACTIVE (1, "active", "有效"), +public enum LocationStatus implements HisEnumInterface { + ACTIVE(1, "active", "有效"), INACTIVE(2, "inactive", "无效"), SUSPENDED(3, "suspended", "临时关闭"); + @EnumValue private final Integer value; private final String code; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java index f109b7dd..7966c482 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java @@ -35,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; @@ -65,8 +68,8 @@ public class Location extends HisBaseEntity { /** 显示顺序 */ private Integer displayOrder; - public Location(Long id, String busNo, String name, LocationStatus statusEnum, LocationBedStatus operationalEnum, - LocationMode modeEnum, String typeCode, String typeJson, String pyStr, String wbStr, Integer formEnum, + 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; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java index cd9d1997..7ced79a4 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java @@ -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; - } \ No newline at end of file