diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java index 2523d542..89835fab 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java @@ -7,6 +7,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -22,6 +23,7 @@ import com.core.common.xss.Xss; * * @author system */ +@Data public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; @@ -91,6 +93,12 @@ public class SysUser extends BaseEntity { /** 角色ID */ private Long roleId; + /** 租户ID */ + private Integer tenantId; + + /** 删除标识 */ + private String deleteFlag; + public SysUser() { } diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java index 7ea46d21..95857469 100644 --- a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java +++ b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java @@ -1,5 +1,17 @@ package com.core.framework.config; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; @@ -8,15 +20,9 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.core.common.utils.SecurityUtils; + import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; @EnableTransactionManagement(proxyTargetClass = true) @Configuration @@ -41,7 +47,7 @@ public class MybatisPlusConfig { public PaginationInnerInterceptor paginationInnerInterceptor() { PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); // 设置数据库类型为mysql - //paginationInnerInterceptor.setDbType(DbType.MYSQL); + // paginationInnerInterceptor.setDbType(DbType.MYSQL); paginationInnerInterceptor.setDbType(DbType.POSTGRE_SQL); // 设置最大单页限制数量，默认 500 条，-1 不受限制 paginationInnerInterceptor.setMaxLimit(-1L); @@ -81,56 +87,19 @@ public class MybatisPlusConfig { } // 配置需要租户隔离的表名集合 - private static final Set TENANT_TABLES = new HashSet<>(Arrays.asList( - "adm_account", - "adm_charge_item", - "adm_charge_item_def_detail", - "adm_charge_item_definition", - "adm_device", - "adm_device_definition", - "adm_encounter", - "adm_encounter_diagnosis", - "adm_encounter_location", - "adm_encounter_participant", - "adm_encounter_reason", - "adm_healthcare_service", - "adm_invoice", - "adm_location", - "adm_organization", - "adm_organization_location", - "adm_patient", - "adm_patient_identifier", - "adm_practitioner", - "adm_practitioner_role", - "adm_supplier", - "cli_condition", - "cli_condition_definition", - "cli_diagnosis_belong_binding", - "cli_procedure", - "cli_procedure_performer", - "doc_emr", - "doc_emr_template", - "doc_emr_detail", - "doc_emr_dict", - "fin_claim", - "fin_claim_response", - "fin_contract", - "fin_payment_notice", - "fin_payment_rec_detail", - "fin_payment_reconciliation", - "med_medication", - "med_medication_definition", - "med_medication_dispense", - "med_medication_request", - "wor_activity_definition", - "wor_device_dispense", - "wor_device_request", - "wor_inventory_item", - "wor_service_request", - "wor_service_request_detail", - "wor_supply_delivery", - "wor_supply_request" - )); + private static final Set TENANT_TABLES = new HashSet<>(Arrays.asList("adm_account", + "adm_charge_item", "adm_charge_item_def_detail", "adm_charge_item_definition", "adm_device", + "adm_device_definition", "adm_encounter", "adm_encounter_diagnosis", "adm_encounter_location", + "adm_encounter_participant", "adm_encounter_reason", "adm_healthcare_service", "adm_invoice", + "adm_location", "adm_organization", "adm_organization_location", "adm_patient", + "adm_patient_identifier", "sys_user", "adm_practitioner", "adm_practitioner_role", "adm_supplier", + "cli_condition", "cli_condition_definition", "cli_diagnosis_belong_binding", "cli_procedure", + "cli_procedure_performer", "doc_emr", "doc_emr_template", "doc_emr_detail", "doc_emr_dict", "fin_claim", + "fin_claim_response", "fin_contract", "fin_payment_notice", "fin_payment_rec_detail", + "fin_payment_reconciliation", "med_medication", "med_medication_definition", "med_medication_dispense", + "med_medication_request", "wor_activity_definition", "wor_device_dispense", "wor_device_request", + "wor_inventory_item", "wor_service_request", "wor_service_request_detail", "wor_supply_delivery", + "wor_supply_request")); @Override public boolean ignoreTable(String tableName) { @@ -147,10 +116,24 @@ public class MybatisPlusConfig { * 获取当前租户 ID */ private Integer getCurrentTenantId() { + // // 尝试从请求头中获取租户ID + ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + HttpServletRequest request = attributes.getRequest(); + // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里 + String tenantIdHeader = request.getHeader("X-Tenant-ID"); + String requestMethodName = request.getHeader("Request-Method-Name"); + // 登录 + if ("login".equals(requestMethodName)) { + if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) { + return Integer.parseInt(tenantIdHeader); + } + } + } // 获取当前登录用户的租户 ID if (SecurityUtils.getAuthentication() != null) { return SecurityUtils.getLoginUser().getTenantId(); } - return 0; + return 0; // 默认租户ID } } diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java b/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java index 0630a89c..1dd9fb0d 100644 --- a/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java +++ b/openhis-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java @@ -1,6 +1,7 @@ package com.core.framework.web.service; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; @@ -8,6 +9,8 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.core.common.constant.CacheConstants; import com.core.common.constant.Constants; @@ -60,7 +63,7 @@ public class SysLoginService { */ public String login(String username, String password, String code, String uuid) { // 验证码校验 - validateCaptcha(username, code, uuid); + // validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证 @@ -89,9 +92,18 @@ public class SysLoginService { LoginUser loginUser = (LoginUser)authentication.getPrincipal(); // -----start-----登录时set租户id,正常应该从请求头获取,这行代码只是测试使用 - loginUser.setTenantId(1); + Integer tenantId = 0; + ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + HttpServletRequest request = attributes.getRequest(); + // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里 + String tenantIdHeader = request.getHeader("X-Tenant-ID"); + if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) { + tenantId = Integer.parseInt(tenantIdHeader); + } + } + loginUser.setTenantId(tenantId); // -----end-----登录时set租户id,正常应该从请求头获取,这行代码只是测试使用 - recordLoginInfo(loginUser.getUserId()); // 生成token return tokenService.createToken(loginUser); diff --git a/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml b/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml index 0db98b29..55d07a54 100644 --- a/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/openhis-server/core-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -121,8 +121,18 @@ #{roleKey}, #{roleSort}, #{dataScope}, - #{menuCheckStrictly}, - #{deptCheckStrictly}, + + + 1, + 0, + + + + + 1, + 0, + + #{status}, #{remark}, #{createBy}, @@ -137,8 +147,18 @@ role_key = #{roleKey}, role_sort = #{roleSort}, data_scope = #{dataScope}, - menu_check_strictly = #{menuCheckStrictly}, - dept_check_strictly = #{deptCheckStrictly}, + + + 1, + 0, + + + + + 1, + 0, + + status = #{status}, remark = #{remark}, update_by = #{updateBy}, diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java index 9704f1d1..9c9e3304 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java @@ -1,47 +1,8 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - -import com.core.common.core.domain.R; -import com.openhis.web.basedatamanage.dto.PractSearchParam; -import com.openhis.web.basedatamanage.dto.PractitionerDto; - /** - * Practitioner 应该服务类 + * 参与者 应该服务类 */ public interface IPractitionerAppService { - /** - * 查询员工信息 - * - * @param pageNo 当前页码 - * @param pageSize 查询条数 - * @param request 请求数据 - * @return 员工分页列表 - */ - R getPractitionerPage(PractSearchParam practSearchParam, String searchKey, Integer pageNo, Integer pageSize, - HttpServletRequest request); - /** - * 员工信息详情 - * - * @param practitionerId 员工信息id - * @return 员工信息详情 - */ - R getPractitionerById(Long practitionerId); - - /** - * 添加/编辑员工信息 - * - * @param practitionerDto 员工信息 - * @return 操作结果 - */ - R addOrEditPractitioner(PractitionerDto practitionerDto); - - /** - * 员工信息 - * - * @param practitionerId 员工信息id - * @return 操作结果 - */ - R deletePractitioner(Long practitionerId); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java index fb2034da..32ae53a0 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java @@ -1,117 +1,16 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; +import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -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.service.IPractitionerRoleService; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.utils.HisPageUtils; -import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basedatamanage.appservice.IPractitionerAppService; -import com.openhis.web.basedatamanage.dto.PractSearchParam; -import com.openhis.web.basedatamanage.dto.PractitionerDto; +import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper; @Service public class PractitionerAppServiceImpl implements IPractitionerAppService { - @Autowired - private IPractitionerService practitionerService; + @Resource + PractitionerAppAppMapper practitionerAppAppMapper; - @Autowired - private PractitionerMapper practitionerMapper; - - @Autowired - private IPractitionerRoleService practitionerRoleService; - - @Override - public R getPractitionerPage(PractSearchParam practSearchParam, String searchKey, Integer pageNo, - Integer pageSize, HttpServletRequest request) { - - // 构建查询条件 - QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(practSearchParam, searchKey, - new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request); - - // 查询员工分页列表 - Page practitionerDtoPage = - HisPageUtils.selectPage(practitionerMapper, queryWrapper, pageNo, pageSize, PractitionerDto.class); - - return R.ok(practitionerDtoPage, - MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"员工信息"})); - } - - /** - * 员工信息详情 - * - * @param practitionerId 员工信息id - * @return 员工信息详情 - */ - @Override - public R getPractitionerById(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 员工信息 - * @return 操作结果 - */ - @Override - public R addOrEditPractitioner(PractitionerDto practitionerDto) { - - Practitioner practitioner = new Practitioner(); - BeanUtils.copyProperties(practitionerDto, practitioner); - PractitionerRole practitionerRole = new PractitionerRole(); - - if (practitionerDto.getId() != null) { - // 更新员工信息 - practitionerService.updateById(practitioner); - } else { - // 新增员工信息 - practitionerService.save(practitioner); - - // 新增员工岗位信息 - practitionerRole.setPractitionerId(practitioner.getId()); - practitionerRole.setName(practitioner.getName()); - practitionerRoleService.save(practitionerRole); - } - // 返回员工id - return R.ok(practitioner.getId(), - MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"员工信息更新添加"})); - } - - /** - * 删除员工 - * - * @param practitionerId 员工信息id - * @return 操作结果 - */ - @Override - public R deletePractitioner(Long practitionerId) { - // 删除员工信息 - boolean deletepractitioner = practitionerService.removeById(practitionerId); - return deletepractitioner - ? R.ok(practitionerId, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"员工信息"})) - : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"员工信息"})); - } } 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 index 96173a77..2a3c59a2 100644 --- 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 @@ -3,25 +3,16 @@ */ package com.openhis.web.basedatamanage.controller; -import javax.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.appservice.IPractitionerAppService; -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 + * 参与者 Controller业务层处理 */ @RestController @RequestMapping("/base-data-manage/practitioner") @@ -29,54 +20,6 @@ import lombok.extern.slf4j.Slf4j; @AllArgsConstructor public class PractitionerController { - @Autowired - private IPractitionerAppService practitionerAppService; - - /** - * 员工分页列表 - * - * @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) { - return practitionerAppService.getPractitionerPage(practSearchParam, searchKey, pageNo, pageSize, request); - } - - /** - * 获取员工需要编辑的信息 - * - * @param practitionerId 员工信息 - */ - @GetMapping("/practitioner-getById") - public R getPractitionerById(@Validated @RequestParam Long practitionerId) { - return practitionerAppService.getPractitionerById(practitionerId); - } - - /** - * 编辑员工信息 - * - * @param practitionerDto 员工信息 - */ - @PutMapping("/practitioner") - public R addOrEditPractitioner(@Validated @RequestBody PractitionerDto practitionerDto) { - return practitionerAppService.addOrEditPractitioner(practitionerDto); - } - - /** - * 删除员工信息 - * - * @param practitionerId 主表id - */ - @DeleteMapping("/practitioner") - public R deletePractitioner(@RequestParam Long practitionerId) { - return practitionerAppService.deletePractitioner(practitionerId); - } + private final IPractitionerAppService practitionerAppService; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java new file mode 100644 index 00000000..9e50ba06 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java @@ -0,0 +1,11 @@ +package com.openhis.web.basedatamanage.mapper; + +import org.springframework.stereotype.Repository; + +/** + * 参与者 应用Mapper + */ +@Repository +public interface PractitionerAppAppMapper { + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java new file mode 100644 index 00000000..41f69488 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java @@ -0,0 +1,22 @@ +package com.openhis.web.datadictionary.appservice; + +import com.openhis.medication.domain.MedicationDetail; +import com.openhis.web.datadictionary.dto.MedicationManageUpDto; + +/** + * 项目定价 + * + * @author liuhr + * @date 2025/3/25 + */ +public interface IItemDefinitionService { + + /** + * 添加项目定价 + * + * @param medicationManageUpDto 药品目录信息 + * @param medicationDetail 药品信息 + */ + boolean addItem(MedicationManageUpDto medicationManageUpDto, MedicationDetail medicationDetail); + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java index d243d9eb..2994c9ec 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java @@ -35,11 +35,12 @@ public interface ISupplierManagementAppService { * * @param supplierSearchParam 查询条件 * @param searchKey 查询条件-模糊查询 + * @param typeEnum 查询条件 * @param pageNo 查询条件 * @param pageSize 查询条件 * @return 厂商/产地查询结果 */ - R getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey, Integer pageNo, Integer pageSize, + R getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey,Integer typeEnum, Integer pageNo, Integer pageSize, HttpServletRequest request); /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java index 8d14603d..ebd2f777 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java @@ -125,6 +125,8 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag())); // 过敏标记枚举类回显赋值 e.setAllergenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAllergenFlag())); + //器材分类 + e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(DeviceCategory.class, e.getCategoryEnum())); }); // 返回【器材目录列表DTO】分页 @@ -219,12 +221,12 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { @Override public R addDevice(@Validated @RequestBody DeviceManageUpDto deviceManageUpDto) { - DeviceDefinition DeviceDefinition = new DeviceDefinition(); - BeanUtils.copyProperties(deviceManageUpDto, DeviceDefinition); + DeviceDefinition deviceDefinition = new DeviceDefinition(); + BeanUtils.copyProperties(deviceManageUpDto, deviceDefinition); // 新增外来器材目录 - DeviceDefinition.setStatusEnum(PublicationStatus.DRAFT); - return deviceDefinitionService.addDevice(DeviceDefinition) + deviceDefinition.setStatusEnum(PublicationStatus.DRAFT); + return deviceDefinitionService.addDevice(deviceDefinition) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null)); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java new file mode 100644 index 00000000..fde1002d --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java @@ -0,0 +1,95 @@ +package com.openhis.web.datadictionary.appservice.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.core.common.utils.DateUtils; +import com.openhis.administration.domain.ChargeItemDefDetail; +import com.openhis.administration.domain.ChargeItemDefinition; +import com.openhis.administration.service.IChargeItemDefDetailService; +import com.openhis.administration.service.IChargeItemDefinitionService; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.enums.PublicationStatus; +import com.openhis.common.enums.Whether; +import com.openhis.medication.domain.MedicationDetail; +import com.openhis.web.datadictionary.appservice.IItemDefinitionService; +import com.openhis.web.datadictionary.dto.MedicationManageUpDto; + +/** + * 项目定价 实现 + * + * @author liuhr + * @date 2025/3/25 + */ +@Service +public class ItemDefinitionServiceImpl implements IItemDefinitionService { + + @Autowired + IChargeItemDefinitionService chargeItemDefinitionService; + + @Autowired + IChargeItemDefDetailService chargeItemDefDetailService; + + /** + * 添加项目定价 + * + * @param medicationManageUpDto 药品目录信息 + * @param medicationDetail 药品信息 + */ + @Override + public boolean addItem(MedicationManageUpDto medicationManageUpDto, MedicationDetail medicationDetail) { + + ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition(); + chargeItemDefinition.setChargeName(medicationDetail.getName()) + .setStatusEnum(PublicationStatus.ACTIVE.getValue()) + .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION) + .setInstanceId(medicationDetail.getMedicationDefId()).setEffectiveStart(DateUtils.getNowDate()) + // todo 机构ID后续修改 + .setOrgId(1L) + // 财务类别 + .setTypeCode(medicationManageUpDto.getMinimalFee()) + // 医保类别 + .setYbType(medicationManageUpDto.getYbType()).setConditionFlag(Whether.YES.getValue()) + .setPrice(medicationManageUpDto.getRetailPrice()); + boolean insertCIDSuccess = chargeItemDefinitionService.save(chargeItemDefinition); + + if (insertCIDSuccess) { + List shargeItemDefDetails = new ArrayList<>(); + ChargeItemDefDetail chargeItemDefDetail1 = new ChargeItemDefDetail(); + chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + // 单位+批次（unit,pici） 用,符号拼装 + .setConditionCode( + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 购入价 + .setAmount(medicationManageUpDto.getPurchasePrice()).setPriority(0); + + ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail(); + chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + // 单位+批次（unit,pici） 用,符号拼装 + .setConditionCode( + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 零售价 + .setAmount(medicationManageUpDto.getRetailPrice()).setPriority(1); + + shargeItemDefDetails.add(chargeItemDefDetail2); + + ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail(); + chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId()) + // 单位+批次（unit,pici） 用,符号拼装 + .setConditionCode( + medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()) + // 最高零售价 + .setAmount(medicationManageUpDto.getMaximumRetailPrice()).setPriority(2); + + shargeItemDefDetails.add(chargeItemDefDetail3); + + return chargeItemDefDetailService.saveBatch(shargeItemDefDetails); + } + + return false; + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java index af080b35..56582f40 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java @@ -20,20 +20,27 @@ import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.ChineseConvertUtils; import com.core.common.utils.MessageUtils; import com.core.common.utils.SecurityUtils; import com.core.common.utils.bean.BeanUtils; import com.core.common.utils.poi.ExcelUtil; +import com.core.system.service.ISysDictTypeService; +import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.ISupplierService; +import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.AccountStatus; import com.openhis.common.enums.ApplicableScope; import com.openhis.common.enums.PublicationStatus; +import com.openhis.common.enums.Whether; import com.openhis.common.utils.EnumUtils; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDefinition; import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.service.IMedicationDefinitionService; import com.openhis.medication.service.IMedicationService; +import com.openhis.web.datadictionary.appservice.IItemDefinitionService; import com.openhis.web.datadictionary.appservice.IMedicationManageAppService; import com.openhis.web.datadictionary.dto.MedicationManageDto; import com.openhis.web.datadictionary.dto.MedicationManageInitDto; @@ -57,6 +64,14 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi @Autowired private MedicationManageSearchMapper medicationManageSearchMapper; + @Autowired + private ISupplierService supplierService; + + @Autowired + private ISysDictTypeService sysDictTypeService; + + @Autowired + private IItemDefinitionService itemDefinitionServic; /** * 药品目录初始化 @@ -75,9 +90,33 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi List domainEnumOptions = Stream.of(ApplicableScope.values()) .map(domain -> new MedicationManageInitDto.domainEnumOption(domain.getValue(), domain.getInfo())) .collect(Collectors.toList()); + // 查询供应商列表 + List supplierList = supplierService.getList(); + // 供应商信息 + List supplierListOptions = supplierList.stream() + .map(supplier -> new MedicationManageInitDto.supplierListOption(supplier.getId(), supplier.getName())) + .collect(Collectors.toList()); + + // 获取药品分类 + List medicalList = + sysDictTypeService.selectDictDataByType(CommonConstants.DictName.MED_CATEGORY_CODE); + // 获取药品分类 + List medicationCategories = medicalList.stream().map( + category -> new MedicationManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel())) + .collect(Collectors.toList()); + + // 获取是/否 列表 + // 获取状态 + List statusWeatherOption = Stream.of(Whether.values()) + .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); medicationManageInitDto.setStatusFlagOptions(statusEnumOptions); medicationManageInitDto.setDomainFlagOptions(domainEnumOptions); + medicationManageInitDto.setSupplierListOptions(supplierListOptions); + medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories); + medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption); + return R.ok(medicationManageInitDto); } @@ -117,9 +156,9 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi // 药品状态 e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum())); // 活动标记 -// e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())); + // e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())); // 适用范围 -// e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum())); + // e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum())); }); // 返回【药品录列表DTO】分页 @@ -138,6 +177,10 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi Medication medication = new Medication(); BeanUtils.copyProperties(medicationManageUpDto, medication); // 子表信息 BeanUtils.copyProperties(medicationManageUpDto, medicationDefinition);// 主表信息 + // 拼音码 + medicationDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDefinition.getName())); + // 五笔码 + medicationDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDefinition.getName())); // 更新子表药品信息 if (medicationService.updateById(medication)) { @@ -223,10 +266,20 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi MedicationDetail medicationDetail = new MedicationDetail(); BeanUtils.copyProperties(medicationManageUpDto, medicationDetail); + // 拼音码 + medicationDetail.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(medicationDetail.getName())); + // 五笔码 + medicationDetail.setWbStr(ChineseConvertUtils.toWBFirstLetter(medicationDetail.getName())); + // 新增主表外来药品目录 if (medicationDefinitionService.addMedication(medicationDetail)) { + // 新增子表外来药品目录 - return medicationService.addMedication(medicationDetail) + boolean insertMedicationSuccess = medicationService.addMedication(medicationDetail); + // 添加药品成功后，添加相应的条件价格表信息 + boolean insertItemDefinitionSuccess = itemDefinitionServic.addItem(medicationManageUpDto, medicationDetail); + + return (insertMedicationSuccess || insertItemDefinitionSuccess) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"药品目录"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null)); } else { diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java index b1491a05..a6d25ff3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java @@ -12,12 +12,16 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; +import com.alibaba.druid.sql.visitor.functions.Isnull; import com.core.common.utils.ChineseConvertUtils; +import com.core.common.utils.StringUtils; import com.openhis.administration.domain.Supplier; import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; import com.openhis.common.enums.AccountStatus; import com.openhis.common.enums.SupplierType; +import com.openhis.common.enums.SupplyStatus; +import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.EnumUtils; import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService; import com.openhis.web.datadictionary.dto.SupplierDto; @@ -73,27 +77,33 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS * * @param supplierSearchParam 查询条件 * @param searchKey 查询条件-模糊查询 + * @param typeEnum 查询条件 * @param pageNo 查询条件 * @param pageSize 查询条件 * @return 厂商/产地查询结果 */ @Override - public R getSupplierList(SupplierSearchParam supplierSearchParam, - @RequestParam(value = "searchKey", defaultValue = "") String searchKey, - @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + public R getSupplierList(SupplierSearchParam supplierSearchParam, String searchKey, + Integer typeEnum, Integer pageNo, Integer pageSize, HttpServletRequest request) { // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam, searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request); + if(StringUtils.isNotNull(typeEnum)){ + queryWrapper.eq("type_enum",typeEnum); + } + // 设置排序 queryWrapper.orderByAsc("bus_no"); // 分页查询 Page supplierPage = HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class); // 枚举类回显赋值 - supplierPage.getRecords() - .forEach(e -> e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))); + supplierPage.getRecords().forEach(e -> { + e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())); + // 厂商类型 + e.setTypeEnum_enumText(EnumUtils.getInfoByValue(SupplierType.class, e.getTypeEnum())); + }); // 返回【病种目录列表DTO】分页 return R.ok(supplierPage); } @@ -104,7 +114,7 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS * @param supplierUpDto 供应商信息 */ @Override - public R addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { + public R addSupplyRequest(SupplierUpDto supplierUpDto) { Supplier supplierInfo = new Supplier(); BeanUtils.copyProperties(supplierUpDto, supplierInfo); @@ -123,7 +133,7 @@ public class SupplierManagementAppServiceImpl implements ISupplierManagementAppS * @param supplierUpDto 供应商信息 */ @Override - public R editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { + public R editSupplyRequest(SupplierUpDto supplierUpDto) { Supplier supplier = new Supplier(); BeanUtils.copyProperties(supplierUpDto, supplier); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index 01578846..62936fa3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -10,6 +10,7 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; +import com.openhis.common.enums.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,10 +25,6 @@ import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Organization; import com.openhis.administration.service.IOrganizationService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.ActivityDefCategory; -import com.openhis.common.enums.OrganizationType; -import com.openhis.common.enums.PublicationStatus; -import com.openhis.common.enums.Whether; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; @@ -106,6 +103,7 @@ public class DiagnosisTreatmentController { .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(), status.getDictLabel())) .collect(Collectors.toList()); + DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 = new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.TREATMENT_SURGERY.getValue(), ActivityDefCategory.TREATMENT_SURGERY.getInfo()); @@ -113,6 +111,13 @@ public class DiagnosisTreatmentController { diseaseTreatmentCategories.add(diseaseTreatmentCategory2); diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories); + + // 获取类型 + List typeEnumOptions = Stream.of(ActivityType.values()) + .map(status -> new DiagnosisTreatmentInitDto.statusEnumOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + diagnosisTreatmentInitDto.setTypeEnumOptions(typeEnumOptions); + return R.ok(diagnosisTreatmentInitDto); } @@ -145,6 +150,12 @@ public class DiagnosisTreatmentController { e.setYbFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbFlag())); // 医保对码标记枚举类回显赋值 e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag())); + //类型举类回显赋值 + e.setTypeEnum_enumText(EnumUtils.getInfoByValue(ActivityType.class, e.getTypeEnum())); + //目录类别举类回显赋值 + e.setCategory_enumText(EnumUtils.getInfoByValue(ActivityDefCategory.class, e.getCategoryEnum())); + //状态举类回显赋值 + e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum())); }); // 返回【诊疗目录列表DTO】分页 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java index 1b3cb1e1..b6287b7f 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java @@ -9,6 +9,8 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; +import com.openhis.common.enums.*; +import com.openhis.common.utils.EnumUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -21,8 +23,6 @@ import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.clinical.mapper.ConditionDefinitionMapper; import com.openhis.clinical.service.IConditionDefinitionService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.ConditionDefinitionSource; -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; @@ -54,6 +54,7 @@ public class DiseaseManageController { */ @GetMapping("/information-init") public R getDiseaseInit() { + DiseaseManageInitDto diseaseManageInitDto = new DiseaseManageInitDto(); // 获取疾病目录种类 List diseaseCategoryList = Stream.of(ConditionDefinitionSource.values()) @@ -65,6 +66,7 @@ public class DiseaseManageController { .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) .collect(Collectors.toList()); diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions); + return R.ok(diseaseManageInitDto); } @@ -91,6 +93,14 @@ public class DiseaseManageController { // 分页查询 Page diseasePage = HisPageUtils.selectPage(conditionDefinitionMapper, queryWrapper, pageNo, pageSize, DiseaseManageDto.class); + + diseasePage.getRecords().forEach(e -> { + // 医保对码枚举类回显赋值 + e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag())); + //状态 + e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum())); + }); + // 返回【病种目录列表DTO】分页 return R.ok(diseasePage); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java index 5e75103a..20ccc5dd 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java @@ -46,6 +46,7 @@ public class SupplierManagementController { * * @param supplierSearchParam 查询条件 * @param searchKey 查询条件-模糊查询 + * @param typeEnum 查询条件 * @param pageNo 查询条件 * @param pageSize 查询条件 * @return 厂商/产地查询结果 @@ -53,11 +54,12 @@ public class SupplierManagementController { @GetMapping(value = "/get-supplier-list") public R getSupplierList(SupplierSearchParam supplierSearchParam, @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "typeEnum", defaultValue = "") Integer typeEnum, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { // 返回分页 - return supplierManagementAppService.getSupplierList(supplierSearchParam, searchKey, pageNo, pageSize, request); + return supplierManagementAppService.getSupplierList(supplierSearchParam, searchKey,typeEnum, pageNo, pageSize, request); } /** diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java index 87196531..b9212b2d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java @@ -36,7 +36,8 @@ public class DeviceManageDto { private String wbStr; /** 器材分类 */ - private DeviceCategory categoryEnum; + private Integer categoryEnum; + private String categoryEnum_enumText; /** 器材种类 */ private String typeCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java index 2e163bed..f520ed5d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java @@ -94,10 +94,12 @@ public class DeviceManageUpDto { /** 生产厂家 */ @NotNull(message = "生产厂家不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long manufacturerId; /** 供应商 */ @NotNull(message = "供应商不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long supplyId; /** 说明 */ @@ -109,8 +111,19 @@ public class DeviceManageUpDto { /** 执行科室 */ @NotNull(message = "执行科室不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long ruleId; + /** 归属科室 */ + @NotNull(message = "归属科室不能为空") + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + /** 所在位置 */ + @NotNull(message = "所在位置不能为空") + @JsonSerialize(using = ToStringSerializer.class) + private Long locationId; + /** 器材版本 */ private String version; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index 79c4ed95..154f3ad6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -8,6 +8,8 @@ import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; + /** * 诊疗目录分页检索 * @@ -22,7 +24,8 @@ public class DiagnosisTreatmentDto { private Long id; /** 目录类别 */ - private ActivityDefCategory categoryEnum; + private Integer categoryEnum; + private String category_enumText; /** 编码 */ private String busNo; @@ -37,7 +40,8 @@ public class DiagnosisTreatmentDto { private String wbStr; /** 类型 */ - private String typeCode; + private Integer typeEnum; + private String typeEnum_enumText; /** 使用单位 */ private String permittedUnitCode; @@ -54,7 +58,8 @@ public class DiagnosisTreatmentDto { private String ybMatchFlag_enumText; /** 状态 */ - private PublicationStatus statusEnum; + private Integer statusEnum; + private String statusEnum_enumText; /** 身体部位 */ private String bodySiteCode; @@ -67,4 +72,12 @@ public class DiagnosisTreatmentDto { /** 规则id */ private Integer ruleId; + + /** 归属科室 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + /** 所在位置 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long locationId; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java index 6cc44888..77408654 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java @@ -18,6 +18,7 @@ public class DiagnosisTreatmentInitDto { private List statusFlagOptions; private List diseaseTreatmentCategoryList; private List exeOrganizations; + private List typeEnumOptions; /** * 状态 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java index d710d634..312fac10 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java @@ -50,8 +50,10 @@ public class DiseaseManageDto { /** 医保对码标记 */ private Integer ybMatchFlag; + private String ybMatchFlag_enumText; /** 状态 */ - private PublicationStatus statusEnum; + private Integer statusEnum; + private String statusEnum_enumText; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java index c85e7c0c..ab186335 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java @@ -35,6 +35,7 @@ public class MedicationManageDto { private String statusEnum_enumText; /** 所属科室 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; /** 剂型 */ @@ -109,8 +110,9 @@ public class MedicationManageDto { private String wbStr; /** 药品分类 */ - @Dict(dictCode = "medicine_category") + @Dict(dictCode = "med_category_code") private Integer categoryCode; + private String categoryCode_dictText; /** 商品名称 */ private String merchandiseName; @@ -125,7 +127,7 @@ public class MedicationManageDto { private String unitCode; /** 最小单位 */ -// private String minUnitCode; + private String minUnitCode; /** 所含耗材 */ private String comprisedText; @@ -143,7 +145,9 @@ public class MedicationManageDto { private String approvalNumber; /** 医保是否对码 */ + @Dict(dictCode = "sys_yes_no") private Integer ybMatchFlag; + private String ybMatchFlag_dictText; /** 医保编码 */ private String ybNo; @@ -154,20 +158,25 @@ public class MedicationManageDto { /** 是否皮试 */ @Dict(dictCode = "sys_yes_no") private Integer skinTestFlag; + private String skinTestFlag_dictText; /** 是否为注射药物 */ @Dict(dictCode = "sys_yes_no") private Integer injectFlag; + private String injectFlag_dictText; /** 生产厂家 */ + @JsonSerialize(using = ToStringSerializer.class) private Long manufacturerId; /** 供应商 */ + @JsonSerialize(using = ToStringSerializer.class) private Long supplyId; /** 是否限制使用 */ @Dict(dictCode = "sys_yes_no") private Integer restrictedFlag; + private String restrictedFlag_dictText; /** 限制使用范围 */ private String restrictedScope; @@ -175,6 +184,7 @@ public class MedicationManageDto { /** 儿童用药标志 */ @Dict(dictCode = "sys_yes_no") private Integer childrenFlag; + private String childrenFlag_dictText; /** 产品特性 */ private Integer characteristic; @@ -209,10 +219,8 @@ public class MedicationManageDto { /** 当前库存数量(常规单位) */ private String baseQuantity; - /** 最小单位 */ - private String minUnitCode; - /** 当前库存数量(最小单位数量) */ private String minQuantity; + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java index 053b9afd..c432b5af 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java @@ -1,5 +1,6 @@ package com.openhis.web.datadictionary.dto; +import java.util.ArrayList; import java.util.List; import lombok.Data; @@ -16,6 +17,15 @@ import lombok.experimental.Accessors; public class MedicationManageInitDto { private List statusFlagOptions; private List domainFlagOptions; + // 供应商 + private List supplierListOptions; + // 药品类型 + private List medicationCategoryCodeOptions; + // 单位编码 + private List unitCodeOptions; + + // 是/否 状态 + private List statusWeatherOptions; /** * 状态 @@ -44,4 +54,34 @@ public class MedicationManageInitDto { this.info = info; } } + + /** + * 供应商 + */ + @Data + public static class supplierListOption { + private Long value; + private String label; + + public supplierListOption(Long value, String label) { + this.value = value; + this.label = label; + } + } + + /** + * 药品类型 + */ + @Data + public static class dictCategoryCode { + private String value; + private String info; + private List children = new ArrayList<>(); + + public dictCategoryCode(String value, String info) { + this.value = value; + this.info = info; + } + } + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index 61d48ebc..8f90e405 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java @@ -5,9 +5,11 @@ import java.util.Date; import javax.validation.constraints.NotBlank; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; @@ -30,8 +32,13 @@ public class MedicationManageUpDto { private Long medicationDefId; /** 所属科室 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; + /** 所在位置 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long locationId; + /** 剂型 */ private String doseFormCode; @@ -48,9 +55,11 @@ public class MedicationManageUpDto { private String lotNumber; /** 生效日期 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date effectiveDate; /** 到期日期 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date expirationDate; /** 用法 */ @@ -63,7 +72,9 @@ public class MedicationManageUpDto { private BigDecimal dose; /** 剂量单位 */ + @Dict(dictCode = "unit_code") private String doseUnitCode; + private String doseUnitCode_dictText; /** 单次最大剂量 */ private BigDecimal maxUnit; @@ -143,9 +154,11 @@ public class MedicationManageUpDto { private Integer injectFlag; /** 生产厂家 */ + @JsonSerialize(using = ToStringSerializer.class) private Long manufacturerId; /** 供应商 */ + @JsonSerialize(using = ToStringSerializer.class) private Long supplyId; /** 是否限制使用 */ @@ -160,4 +173,19 @@ public class MedicationManageUpDto { /** 产品特性 */ private Integer characteristic; + /** 购入价 */ + private BigDecimal purchasePrice; + + /** 零售价 */ + private BigDecimal retailPrice; + + /** 最高零售价 */ + private BigDecimal maximumRetailPrice; + + /** 医保类别 */ + private String ybType; + + /** 最小费用 */ + private String minimalFee; + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java index c4f145c5..b2169fd5 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; @@ -35,6 +36,7 @@ public class SupplierDto { /** 类型 */ private Integer typeEnum; + private String typeEnum_enumText; /** 地址 */ private String address; @@ -57,5 +59,7 @@ public class SupplierDto { /** 机构编号 */ @JsonSerialize(using = ToStringSerializer.class) + @Dict(dictTable = "adm_organization",dictCode = "id",dictText = "name") private Long orgId; + private String orgId_dictText; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java index dcced6ff..dc094629 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java @@ -98,7 +98,7 @@ public class PurchaseInventoryController { * @return 操作结果 */ @PutMapping("/submit-approval") - public R submitApproval(@RequestParam String busNo) { + public R submitApproval(@RequestBody String busNo) { return purchaseInventoryAppService.submitApproval(busNo); } @@ -109,7 +109,7 @@ public class PurchaseInventoryController { * @return 操作结果 */ @PutMapping("/withdraw-approval") - public R withdrawApproval(@RequestParam String busNo) { + public R withdrawApproval(@RequestBody String busNo) { return purchaseInventoryAppService.withdrawApproval(busNo); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java index 4e7655a3..a69a87dc 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java @@ -71,7 +71,7 @@ public class PurchaseInventoryDto { private Long purposeLocationStoreId; /** 申请人 */ - @NotNull +// @NotNull private Long applicantId; /** 经手人 */ diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml new file mode 100644 index 00000000..f5b8f393 --- /dev/null +++ b/openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml index 0648bec3..0546ef98 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml @@ -53,13 +53,13 @@ T1.characteristic, T1.national_drug_code, T1.part_attribute, - T1.antibiotic_code - T1.restricted_enum - T1.self_flag - T1.antibiotic_flag - T1.basic_flag + T1.antibiotic_code, + T1.restricted_enum, + T1.self_flag, + T1.antibiotic_flag, + T1.basic_flag, T1.remark, - T3.manufacturer_name, + T3.name AS manufacturer_name, T4.base_unit_code, T4.base_quantity, T4.min_unit_code, diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java index e6209cbb..bc9f0656 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java @@ -184,6 +184,17 @@ public class CommonConstants { String TCM_DIAGNOSIS = "中医诊断"; } + /** + * 字典字段名常量 + */ + public interface DictName { + /** + * 药品分类 + */ + String MED_CATEGORY_CODE = "med_category_code"; + + } + /** * sql条件常量 */ diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java index 82c62551..7de26f66 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum DeviceCategory { +public enum DeviceCategory implements HisEnumInterface { ACTIVE (1, "active", "有源的"), COMMUNICATING(2, "communicating", "通讯类"), HOMEUSE(3, "communicating", "非院内使用"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRole.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRole.java index b9312351..5ec25b1a 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRole.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRole.java @@ -6,11 +6,12 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * 参与者角色 + * 参与者角色 : 对应 sys_role表的角色标识 ; 需要补充业务数据时在该枚举类添加 */ @Getter @AllArgsConstructor public enum PractitionerRole implements HisEnumInterface { + DOCTOR(1, "doctor", "医生"), NURSE(2, "nurse", "护士"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java index b81be822..68bded60 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum SupplierType { +public enum SupplierType implements HisEnumInterface { DRAFT(1, "1", "生产商"), ACTIVE(2, "2", "供应商"); diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java new file mode 100644 index 00000000..3c830920 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java @@ -0,0 +1,72 @@ +package com.openhis.administration.domain; + +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-20 + */ +@Data +@TableName("sys_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class BizUser extends HisBaseEntity { + + /** 用户ID */ + @TableId(type = IdType.ASSIGN_ID) + private Long userId; + + /** 部门ID */ + private Long deptId; + + /** 用户账号 */ + private String userName; + + /** 用户昵称 */ + private String nickName; + + /** 用户类型 */ + private String userType; + + /** 用户邮箱 */ + private String email; + + /** 手机号码 */ + private String phonenumber; + + /** 用户性别 */ + private String sex; + + /** 用户头像 */ + private String avatar; + + /** 密码 */ + private String password; + + /** 帐号状态（0正常 1停用） */ + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 最后登录IP */ + private String loginIp; + + /** 最后登录时间 */ + private Date loginDate; + + /** 备注 */ + private String remark; + +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java new file mode 100644 index 00000000..6c9af566 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java @@ -0,0 +1,27 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 用户角色Entity实体 + * + * @author system + * @date 2025-02-20 + */ +@Data +@TableName("sys_user_role") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class BizUserRole { + + /** 用户ID */ + private Long userId; + + /** 角色ID */ + private Long roleId; + +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index fb63ec88..7bb64a9c 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java @@ -36,7 +36,7 @@ public class ChargeItemDefinition extends HisBaseEntity { private String title; /** 状态 */ - private PublicationStatus statusEnum; + private Integer statusEnum; /** 机构ID */ private Long orgId; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index 30b4c780..610637b7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java @@ -92,6 +92,9 @@ public class DeviceDefinition extends HisBaseEntity { /** 生产厂家 */ private Long manufacturerId; + /** 生产厂家 */ + private String manufacturerText; + /** 供应商 */ private Long supplyId; @@ -101,9 +104,6 @@ public class DeviceDefinition extends HisBaseEntity { /** 适用范围 */ private String jurisdiction; - /** 执行科室 */ - private Long ruleId; - /** 器材版本 */ private String version; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java index a5c3c168..ee47e373 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java @@ -80,6 +80,9 @@ public class Practitioner extends HisBaseEntity { /** 医保码 */ private String ybNo; + /** 机构id */ + private Long orgId; + /** 系统用户id */ private Long userId; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java new file mode 100644 index 00000000..d31ae0ac --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java @@ -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.BizUser; + +/** + * 用户管理Mapper接口 + * + * @author system + * @date 2025-02-20 + */ +@Repository +public interface BizUserMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java new file mode 100644 index 00000000..28773514 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java @@ -0,0 +1,18 @@ +package com.openhis.administration.mapper; + +import com.openhis.administration.domain.BizUserRole; +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.administration.domain.BizUser; + +/** + * 用户角色Mapper接口 + * + * @author system + * @date 2025-02-20 + */ +@Repository +public interface BizUserRoleMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java new file mode 100644 index 00000000..a8f0e80f --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java @@ -0,0 +1,14 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.BizUserRole; + +/** + * 用户角色Service接口 + * + * @author system + * @date 2025-02-20 + */ +public interface IBizUserRoleService extends IService { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java new file mode 100644 index 00000000..d1cd92d2 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java @@ -0,0 +1,14 @@ +package com.openhis.administration.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.administration.domain.BizUser; + +/** + * 用户管理Service接口 + * + * @author system + * @date 2025-02-20 + */ +public interface IBizUserService extends IService { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java new file mode 100644 index 00000000..63e75825 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java @@ -0,0 +1,19 @@ +package com.openhis.administration.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.BizUserRole; +import com.openhis.administration.mapper.BizUserRoleMapper; +import com.openhis.administration.service.IBizUserRoleService; + +/** + * 用户角色Service业务层处理 + * + * @author system + * @date 2025-02-20 + */ +@Service +public class BizUserRoleServiceImpl extends ServiceImpl implements IBizUserRoleService { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java new file mode 100644 index 00000000..fc108152 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java @@ -0,0 +1,19 @@ +package com.openhis.administration.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.administration.domain.BizUser; +import com.openhis.administration.mapper.BizUserMapper; +import com.openhis.administration.service.IBizUserService; + +/** + * 用户管理Service业务层处理 + * + * @author system + * @date 2025-02-20 + */ +@Service +public class BizUserServiceImpl extends ServiceImpl implements IBizUserService { + +} \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 6db29b4c..1ce3be40 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -99,6 +99,9 @@ public class MedicationDefinition extends HisBaseEntity { /** 生产厂家 */ private Long manufacturerId; + /** 生产厂商文本 */ + private String manufacturerText; + /** 供应商 */ private Long supplyId; diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml b/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml new file mode 100644 index 00000000..f7fd379c --- /dev/null +++ b/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml b/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml new file mode 100644 index 00000000..73b709a8 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/utils/request.js b/openhis-ui-vue3/src/utils/request.js index 3a9be89d..d3118339 100644 --- a/openhis-ui-vue3/src/utils/request.js +++ b/openhis-ui-vue3/src/utils/request.js @@ -12,6 +12,8 @@ let downloadLoadingInstance; export let isRelogin = { show: false }; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +axios.defaults.headers['X-Tenant-ID'] = '1' +axios.defaults.headers['Request-Method-Name'] = 'login' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js index 3282d902..98d535eb 100644 --- a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js @@ -70,3 +70,12 @@ export function getSupplierInit() { method: 'get' }) } + +// 查询部门树结构 +export function deptTreeSelect(queryParams) { + return request({ + url: '/base-data-manage/organization/organization', + method: 'get', + param: queryParams + }) +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue index b418cda9..ab38a259 100644 --- a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue @@ -7,27 +7,18 @@ v-show="showSearch" label-width="90px" > - - - - + - + + + + @@ -260,12 +264,22 @@ - + - - + + + + + @@ -289,6 +303,7 @@ import { stopSupplier, startSupplier, getSupplierInit, + deptTreeSelect, } from "./components/supplier"; const router = useRouter(); @@ -308,6 +323,7 @@ const multiple = ref(true); const total = ref(0); const title = ref(""); const supplierTypeOptions = ref(undefined); +const deptOptions = ref(undefined); // 部门树选项 // 是否停用 const statusFlagOptions = ref(undefined); // const initPassword = ref(undefined); @@ -320,9 +336,9 @@ const data = reactive({ pageNo: 1, pageSize: 10, searchKey: undefined, // 供应商名称 - busNo: undefined, // 编码 - statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用） - sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义） + // busNo: undefined, // 编码 + typeEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用） + // sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义） }, rules: { busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }], @@ -349,6 +365,16 @@ function getsupplierTypeList() { }); } +/** 查询部门下拉树结构 */ +function getDeptTree() { + console.log("查询部门下拉树结构"); + deptTreeSelect().then((response) => { + console.log(response, "response查询部门下拉树结构"); + deptOptions.value = response.data.records; + console.log(deptOptions.value, "部门下拉树结构"); + }); +} + /** 查询厂商/产地目录列表 */ function getList() { loading.value = true; @@ -356,7 +382,7 @@ function getList() { console.log(queryParams.value, "queryParams.value"); getSupplierList(queryParams.value).then((res) => { loading.value = false; - console.log(res, "res",res.data.records); + console.log(res, "res", res.data.records); supplierList.value = res.data.records; console.log(supplierList.value, "supplierList.value"); total.value = res.data.total; @@ -458,6 +484,8 @@ function handleUpdate(row) { reset(); console.log(row, "row"); form.value = JSON.parse(JSON.stringify(row)); + form.value.activeFlag == 1 ? (form.value.activeFlag = true) : (form.value.activeFlag = false); //是否为活性 + // console.log(form.value.ty, "form.value"); open.value = true; title.value = "厂商/产地编辑"; } @@ -465,6 +493,7 @@ function handleUpdate(row) { function submitForm() { proxy.$refs["supplierRef"].validate((valid) => { if (valid) { + form.activeFlag == true ? (form.activeFlag = 1) : (form.activeFlag = 0); //是否为活性 if (form.value.id != undefined) { console.log(form.value, "editSupplier", form.value.statusEnum); editSupplier(form.value).then((response) => { @@ -495,6 +524,7 @@ function handleView(row) { } getsupplierTypeList(); getList(); +getDeptTree(); \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue index 27d89d78..67d646a2 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue @@ -205,6 +205,8 @@ v-loading="loading" :data="purchaseinventoryList" @selection-change="handleSelectionChange" + @row-click="handleRowClick" + ref="tableRef" > { + + // 挂载时绑定事件 + onMounted(() => { + document.addEventListener('click', handleClickOutside); + }); + + // 卸载时移除事件 + onUnmounted(() => { + document.removeEventListener('click', handleClickOutside); + }); + +function addNewRow() { if (data.isAdding) { proxy.$message.warning("请先保存当前行后再新增！"); return; @@ -778,8 +791,9 @@ const addNewRow = () => { error: false, // 新增 error 字段 }; purchaseinventoryList.value.push(newRow); + total.value = purchaseinventoryList.value.length; data.isAdding = true; // 设置标志位为 true，表示有未保存的 -}; +} function handleBlur(row, index) { let hasError = false; @@ -832,7 +846,22 @@ function handleBlur(row, index) { // } } -const saveRow = (row, index) => { +// 点击行时记录当前行 +function handleRowClick(row) { + currentRow.value = row; +} + +// 监听表格外的点击事件 +function handleClickOutside(event) { + if (tableRef.value && !tableRef.value.$el.contains(event.target)) { + if (currentRow.value) { + handleSave(currentRow.value); + currentRow.value = null; // 清空当前行 + } + } +} + +function saveRow(row, index) { console.log(row, "saveRowsaveRowsaveRowsaveRowsaveRowsaveRow"); // 保存当前行的逻辑... // 例如：调用 API 保存数据 @@ -865,15 +894,15 @@ const saveRow = (row, index) => { } // proxy.$message.success("保存成功！"); -}; +} -function handleSave( row , index ) { +function handleSave(row, index) { let hasError = false; // this.purchaseinventoryList.forEach((row) => { - handleBlur(row); - if (row.error) { - hasError = true; - } + handleBlur(row); + if (row.error) { + hasError = true; + } // }); if (hasError) { @@ -918,7 +947,7 @@ function handleSelectionChange(selection) { multiple.value = !selection.length; } -const deleteSelectedRows = () => { +function deleteSelectedRows() { if (selectedRows.value.length === 0) { alert("请先选择要删除的行"); return; @@ -929,7 +958,7 @@ const deleteSelectedRows = () => { ); selectedRows.value = []; // 清空选中行 -}; +} /** 重置操作表单 */ function reset() { @@ -994,6 +1023,7 @@ function edit() { receiptHeaderForm.value = props.item.length > 0 ? props.item[0] : {}; // receiptHeaderForm.value.busNo = props.item.supplyBusNo; purchaseinventoryList.value = props.item; + total.value = purchaseinventoryList.value.length; console.log(purchaseinventoryList.value, "purchaseinventoryList.value"); console.log(receiptHeaderForm.value, "receiptHeaderForm.value"); loading.value = false; diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js index 60be2a42..c4c79651 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/purchaseinventory.js @@ -29,7 +29,7 @@ export function addPurchaseinventory(data) { } -// 查询厂商类型 +// 查询采购入库单据初始化数据 export function getInit() { return request({ url: '/inventory-manage/purchase/init', @@ -37,30 +37,31 @@ export function getInit() { }) } -// 查询部门树形数据 -export function deptTreeSelect(queryParams) { - return request({ - url: '/base-data-manage/organization/organization', - method: 'get', - param: queryParams - }) -} -// 查询地点树形数据 -export function locationTreeSelect(queryParams) { - return request({ - url: '/base-data-manage/cabinet-location/cabinet-location', - method: 'get', - param: queryParams - }) -} - -// 删除收费挂号项目 +// 删除单据 export function delPurchaseinventory(param) { console.log(param,'aaaa') return request({ - url: '/basic-service/healthcare/healthcare-service', + url: '/inventory-manage/purchase/inventory-receipt', method: 'delete', params: param }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo } + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo } + }) } \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue index 1877cc24..b067bdd7 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue @@ -186,7 +186,7 @@ @@ -234,8 +244,8 @@ import { addPurchaseinventory, getpurchaseInventoryDetail, getInit, - deptTreeSelect, - locationTreeSelect, + submitApproval, + withdrawApproval, delPurchaseinventory, } from "./components/purchaseinventory"; @@ -244,21 +254,6 @@ import inventoryReceiptDialog from "./components/inventoryReceiptDialog"; const router = useRouter(); const { proxy } = getCurrentInstance(); const purchaseinventoryRef = ref(null); // 初始化 ref -const { - adm_location, - category_code, - service_type_code, - specialty_code, - med_chrgitm_type, - financial_type_code, -} = proxy.useDict( - "adm_location", - "category_code", - "service_type_code", - "specialty_code", - "med_chrgitm_type", - "financial_type_code" -); const purchaseinventoryList = ref([]); const open = ref(false); @@ -269,10 +264,6 @@ const single = ref(true); const multiple = ref(true); const total = ref(0); const title = ref(""); -const activeFlagOptions = ref(undefined); -const appointmentRequiredFlagOptions = ref(undefined); -const deptOptions = ref(undefined); // 部门树选项 -const locationOptions = ref(undefined); // 地点树选项 const dateRange = ref([]); const busNoAdd = ref(""); // 单据号新增 const itemTypeOptions = ref(undefined); // 入库项目类型 @@ -312,25 +303,6 @@ function getPurchaseinventoryTypeList() { }); } -/** 查询部门下拉树结构 */ -function getDeptTree() { - deptTreeSelect().then((response) => { - console.log(response, "response查询部门下拉树结构"); - - deptOptions.value = response.data.records; - console.log(deptOptions.value, "部门下拉树结构"); - }); -} - -/** 查询地点下拉树结构 */ -function getLocationTree() { - locationTreeSelect().then((response) => { - console.log(response, "response查询部门下拉树结构"); - locationOptions.value = response.data.records; - console.log(locationOptions.value, "部门下拉树结构"); - }); -} - /** 查询采购入库项目列表 */ function getList() { loading.value = true; @@ -348,8 +320,14 @@ function getList() { /** 搜索按钮操作 */ function handleQuery() { - queryParams.value.S_TIME = dateRange.value[0] + " 00:00:00"; - queryParams.value.E_TIME = dateRange.value[1] + " 23:59:59"; + queryParams.value.occurrenceTimeSTime = + dateRange.value && dateRange.value.length == 2 + ? dateRange.value[0] + " 00:00:00" + : ""; + queryParams.value.occurrenceTimeETime = + dateRange.value && dateRange.value.length == 2 + ? dateRange.value[1] + " 23:59:59" + : ""; queryParams.value.pageNo = 1; getList(); } @@ -363,8 +341,6 @@ function handleClear() { /** 选择条数 */ function handleSelectionChange(selection) { - console.log(selection, "selection"); - // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据 ids.value = selection.map((item) => item.id); single.value = selection.length != 1; multiple.value = !selection.length; @@ -372,43 +348,16 @@ function handleSelectionChange(selection) { /** 打开新增弹窗 */ function openAddInventoryReceiptDialog() { - proxy.$refs["inventoryReceiptRef"].show(); -} -/** 重置操作表单 */ -function reset() { - form.value = { - id: undefined, - name: undefined, - categoryCode: undefined, - cwTypeCode: undefined, - fwTypeCode: undefined, - specialtyCode: undefined, - locationId: undefined, - offeredOrgId: undefined, - activeFlag: undefined, - extraDetails: undefined, - contact: undefined, - appointmentRequiredFlag: undefined, - chargeName: undefined, - price: undefined, - description: undefined, - ybType: undefined, - title: undefined, - comment: undefined, - }; - proxy.resetForm("purchaseinventoryRef"); -} -/** 取消按钮 */ -function cancel() { - open.value = false; - reset(); + getPurchaseinventoryTypeList(); + nextTick(() => { + proxy.$refs["inventoryReceiptRef"].show(); + }); } /** 修改按钮操作 */ function handleUpdate(row) { - console.log(typeof(row.supplyBusNo), "row",row); + console.log(typeof row.supplyBusNo, "row", row); getpurchaseInventoryDetail(row.supplyBusNo).then((response) => { - currentData.value = response.data; console.log(response, "response采购入库编辑按钮", currentData.value); nextTick(() => { @@ -417,70 +366,23 @@ function handleUpdate(row) { getList(); }); } -// /** 提交按钮 */ -// function submitForm() { -// // // 调用转换函数 -// // const transformedData = transformFormData(form); -// // console.log(transformedData, "transformedData"); -// // addPurchaseinventory(transformedData).then((response) => { -// // proxy.$modal.msgSuccess("新增成功"); -// // open.value = false; -// getList(); -// // }); -// } - -// 获取完整地址字符串 -function getName() { - console.log(service_type_code.value, "service_type_code.value"); - // 服务类型 - const serviceTypeText = proxy.selectDictLabel( - service_type_code.value, - form.value.fwTypeCode - ); - // 服务分类 - const categoryCodeText = proxy.selectDictLabel( - category_code.value, - form.value.categoryCode - ); - // 服务专业 - const specialtyCodeText = proxy.selectDictLabel( - specialty_code.value, - form.value.specialtyCode - ); - console.log( - serviceTypeText, - "serviceTypeText", - categoryCodeText, - specialtyCodeText - ); - const nameParts = [ - serviceTypeText, - form.value.addressCity, - categoryCodeText, - specialtyCodeText, - ]; - - // 使用 reduce 方法拼接地址，非空字段之间用 '-' 连接 - return nameParts.reduce((acc, part) => { - if (part) { - if (acc) { - acc += " - "; // 在非空字段之间添加 '-' - } - acc += part; - } - return acc; - }, ""); +/** 提交审核按钮 */ +function handleSubmitApproval(row) { + submitApproval(row.supplyBusNo).then((response) => { + proxy.$modal.msgSuccess("提交审批成功"); + open.value = false; + getList(); + }); +} + +/** 撤回审批按钮 */ +function handleWithdrawApproval(row) { + withdrawApproval(row.supplyBusNo).then((response) => { + proxy.$modal.msgSuccess("撤销审批成功"); + open.value = false; + getList(); + }); } -// /** 详细按钮操作 */ -// function handleView(row) { -// reset(); -// title.value = "查看"; -// open.value = true; -// getPurchaseinventoryOne(row.id).then((response) => { -// console.log(response, "responsebbbb", row.id); -// form.value = response.data; -// }); -// } /** 删除按钮操作 */ function handleDelete(row) { @@ -496,102 +398,8 @@ function handleDelete(row) { }) .catch(() => {}); } -// 转换insert参数函数 -const transformFormData = (form) => { - const { - id, - name, - categoryCode, - // typeCode, - cwTypeCode, - fwTypeCode, - specialtyCode, - locationId, - offeredOrgId, - activeFlag, - extraDetails, - contact, - appointmentRequiredFlag, - chargeName, - price, - description, - ybType, - title, - comment, - } = form.value; - return { - healthcareServiceFormData: { - id, - activeFlag, - offeredOrgId, - categoryCode, - typeCode: fwTypeCode, - specialtyCode, - locationId, - name, - contact, - appointmentRequiredFlag, - extraDetails, - comment, - }, - chargeItemDefinitionFormData: { - id, - chargeName, - title, - orgId: offeredOrgId, - description, - typeCode: cwTypeCode, - ybType, - price, - }, - }; -}; - -// 转换insert参数函数 -const transformFormEditData = (form) => { - const { - id, - name, - categoryCode, - // typeCode, - cwTypeCode, - fwTypeCode, - specialtyCode, - locationId, - offeredOrgId, - activeFlag, - extraDetails, - contact, - appointmentRequiredFlag, - chargeName, - price, - description, - ybType, - title, - comment, - } = form.value; - - return { - healthcareServiceFormData: { - id, - activeFlag, - offeredOrgId, - categoryCode, - typeCode: fwTypeCode, - specialtyCode, - locationId, - name, - contact, - appointmentRequiredFlag, - extraDetails, - comment, - }, - }; -}; getPurchaseinventoryTypeList(); -getDeptTree(); -getLocationTree(); getList();