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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
View File

@@ -166,4 +166,26 @@ public interface ICommonService {
* @return 医嘱打印单
*/
R<?> getAdvicePrintInfo(List<Long> requestIds, String isPrescription);
/**
* 查询参与者签名
*
* @param practitionerId 参与者id
* @return 参与者签名
*/
R<?> getPractitionerSignature(Long practitionerId);
/**
* 查询所有供应商
*
* @return 供应商
*/
R<?> getSupplierList();
/**
* 查询所有诊疗项目
*
* @return 诊疗项目
*/
R<?> getActivityDefinition();
}

45
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
View File

@@ -22,11 +22,13 @@ import com.core.common.utils.StringUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.Location;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.domain.TraceNoManage;
import com.openhis.administration.mapper.TraceNoManageMapper;
import com.openhis.administration.service.ILocationService;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.administration.service.IPractitionerRoleService;
import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.*;
import com.openhis.common.utils.EnumUtils;
@@ -65,11 +67,14 @@ public class CommonServiceImpl implements ICommonService {
private IOrganizationService organizationService;
@Resource
private IInventoryItemService iInventoryItemService;
private IInventoryItemService inventoryItemService;
@Resource
private ContractMapper contractMapper;
@Resource
private ISupplierService supplierService;
/**
* 获取药房列表
*
@@ -282,11 +287,10 @@ public class CommonServiceImpl implements ICommonService {
// 医保编码和生产厂家校验
for (LocationInventoryDto dto : locationInventoryDtoList) {
if (StringUtils.isNotEmpty(dto.getYbNo()) && StringUtils.isEmpty(dto.getManufacturer())) {
if (StringUtils.isNotEmpty(dto.getYbNo()) && StringUtils.isEmpty(dto.getManufacturerText())) {
return R.fail("生产厂家不能为空，请到药品目录维护");
}
}
return R.ok(locationInventoryDtoList);
}
@@ -322,7 +326,7 @@ public class CommonServiceImpl implements ICommonService {
for (String traceNo : traceNoList) {
if (traceNo != null && !StringUtils.isEmpty(traceNo)) {
// 数据源更改
InventoryItem inventoryItem = iInventoryItemService.getOne(
InventoryItem inventoryItem = inventoryItemService.getOne(
new LambdaQueryWrapper<InventoryItem>().like(InventoryItem::getTraceNo, traceNo).last("LIMIT 1"));
if (inventoryItem != null) {
String itemId = inventoryItem.getItemId().toString();
@@ -495,4 +499,37 @@ public class CommonServiceImpl implements ICommonService {
return R.ok(advicePrintInfoDto);
}
/**
* 查询参与者签名
*
* @param practitionerId 参与者id
* @return 参与者签名
*/
@Override
public R<?> getPractitionerSignature(Long practitionerId) {
return R.ok(commonAppMapper.getPractitionerSignature(practitionerId));
}
/**
* 查询所有供应商
*
* @return 供应商
*/
@Override
public R<?> getSupplierList() {
return R.ok(supplierService.list(new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName)
.eq(Supplier::getTypeEnum, SupplierType.SUPPLIER.getValue())
.eq(Supplier::getDeleteFlag, DelFlag.NO.getCode()).eq(Supplier::getActiveFlag, Whether.YES.getValue())));
}
/**
* 查询所有诊疗项目
*
* @return 诊疗项目
*/
@Override
public R<?> getActivityDefinition() {
return R.ok(commonAppMapper.getActivityDefinition(PublicationStatus.ACTIVE.getValue()));
}
}

35
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
View File

@@ -7,8 +7,6 @@ import java.util.List;
import javax.annotation.Resource;
import com.openhis.common.enums.Whether;
import com.openhis.web.common.dto.AdvicePrintInfoDto;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -221,7 +219,38 @@ public class CommonAppController {
*/
@GetMapping("/advice-print")
public R<?> getAdvicePrintInfo(@RequestParam(value = "requestIds") List<Long> requestIds, String isPrescription) {
return commonService.getAdvicePrintInfo(requestIds,isPrescription);
return commonService.getAdvicePrintInfo(requestIds, isPrescription);
}
/**
* 查询参与者签名
*
* @param practitionerId 参与者id
* @return 参与者签名
*/
@GetMapping(value = "/practitioner-signature")
public R<?> getPractitionerSignature(@RequestParam(value = "practitionerId") Long practitionerId) {
return commonService.getPractitionerSignature(practitionerId);
}
/**
* 查询所有供应商
*
* @return 供应商
*/
@GetMapping(value = "/supplier")
public R<?> getSupplierList() {
return commonService.getSupplierList();
}
/**
* 查询所有诊疗项目
*
* @return 诊疗项目
*/
@GetMapping(value = "/activity-definition")
public R<?> getActivityDefinition() {
return commonService.getActivityDefinition();
}
}

29
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java Normal file
View File

@@ -0,0 +1,29 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.common.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 诊疗项目dto
*
* @author zwh
* @date 2025-04-01
*/
@Data
@Accessors(chain = true)
public class ActivityDefinitionDto {
/** 项目定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long activityDefinitionId;
/** 项目名称 */
private String activityDefinitionName;
}

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
View File

@@ -87,7 +87,7 @@ public class InventoryItemDto {
/**
* 生产厂家
*/
private String manufacturer;
private String manufacturerText;
/**
* 项目对应表名

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
View File

@@ -75,6 +75,6 @@ public class LocationInventoryDto {
private String ybNo;
/** 生产厂家 */
private String manufacturer;
private String manufacturerText;
}

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
View File

@@ -26,24 +26,13 @@ public class PerformInfoDto {
@JsonSerialize(using = ToStringSerializer.class)
private Long requestId;
/** 住院id */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 发放id */
@JsonSerialize(using = ToStringSerializer.class)
private Long dispenseId;
/** 执行id */
@JsonSerialize(using = ToStringSerializer.class)
private Long procedureId;
/** 请求所在表 */
private String requestTable;
/** 执行时间列表 */
private List<String> executeTimes;
/** 执行位置 */
@JsonSerialize(using = ToStringSerializer.class)
private Long locationId;
@@ -51,10 +40,4 @@ public class PerformInfoDto {
/** 分组id */
@JsonSerialize(using = ToStringSerializer.class)
private Long groupId;
/** 执行开始时间 */
private Date exeStartTime;
/** 执行结束时间 */
private Date exeEndTime;
}

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
View File

@@ -88,4 +88,20 @@ public interface CommonAppMapper {
* @return 处置打印信息
*/
AdvicePrintInfoDto selectTreatmentPrintInfo(@Param("requestIds") List<Long> requestIds);
/**
* 查询参与者签名
*
* @param practitionerId 参与者id
* @return 参与者签名
*/
String getPractitionerSignature(@Param("practitionerId") Long practitionerId);
/**
* 查询所有诊疗项目
*
* @param statusEnum 启用状态
* @return 诊疗项目
*/
List<ActivityDefinitionDto> getActivityDefinition(@Param("statusEnum") Integer statusEnum);
}