wangyizhe/his
1
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

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
View File

@@ -100,8 +100,6 @@ public class ActivityDeviceAppServiceImpl implements IActivityDeviceAppService {
@Override
public R<?> getDevicePage(DeviceManageSelParam deviceManageSelParam, String searchKey, Integer pageNo,
Integer pageSize, HttpServletRequest request) {
// 只查询单次消耗类耗材
deviceManageSelParam.setCategoryCode(CommonConstants.BusinessName.SINGLE_CONSUMPTION);
return deviceManageAppService.getDevicePage(deviceManageSelParam, searchKey, pageNo, pageSize, request);
}

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
View File

@@ -92,6 +92,12 @@ public class OrdersGroupPackageAppServiceImpl implements IOrdersGroupPackageAppS
ordersGroupPackageDetail.setOrderDefinitionTable(ordersGroupPackageDetailSaveDto.getOrderDefinitionTable());// 医嘱定义表名
ordersGroupPackageDetail.setQuantity(ordersGroupPackageDetailSaveDto.getQuantity()); // 数量
ordersGroupPackageDetail.setUnitCode(ordersGroupPackageDetailSaveDto.getUnitCode()); // 单位
ordersGroupPackageDetail.setDose(ordersGroupPackageDetailSaveDto.getDose()); // 单次剂量
ordersGroupPackageDetail.setRateCode(ordersGroupPackageDetailSaveDto.getRateCode()); // 用药频次
ordersGroupPackageDetail.setDispensePerDuration(ordersGroupPackageDetailSaveDto.getDispensePerDuration()); // 用药天数
ordersGroupPackageDetail.setMethodCode(ordersGroupPackageDetailSaveDto.getMethodCode()); // 给药途径
ordersGroupPackageDetail.setDoseQuantity(ordersGroupPackageDetailSaveDto.getDoseQuantity()); // 小单位单次剂量
ordersGroupPackageDetail.setGroupId(ordersGroupPackageDetailSaveDto.getGroupId()); // 组号
ordersGroupPackageDetailService.save(ordersGroupPackageDetail);
}

27
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
View File

@@ -53,6 +53,27 @@ public class OrdersGroupPackageDetailQueryDto {
private String unitCode_dictText;
private String unitCodeName;
/** 单次剂量 */
private BigDecimal dose;
/** 用药频次 */
@Dict(dictCode = "rate_code")
private String rateCode;
private String rateCode_dictText;
/** 用药天数 */
private Integer dispensePerDuration;
/** 给药途径 */
@Dict(dictCode = "method_code")
private String methodCode;
private String methodCode_dictText;
/**
* 小单位单次剂量
*/
private BigDecimal doseQuantity;
/**
* 医嘱名称
*/
@@ -63,4 +84,10 @@ public class OrdersGroupPackageDetailQueryDto {
*/
private AdviceBaseDto orderDetailInfos;
/**
* 组号
*/
private Long groupId;
}

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
View File

@@ -42,4 +42,26 @@ public class OrdersGroupPackageDetailSaveDto {
*/
private String unitCode;
/** 单次剂量 */
private BigDecimal dose;
/** 用药频次 */
private String rateCode;
/** 用药天数 */
private Integer dispensePerDuration;
/** 给药途径 */
private String methodCode;
/**
* 小单位单次剂量
*/
private BigDecimal doseQuantity;
/**
* 组号
*/
private Long groupId;
}

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
View File

@@ -8,6 +8,7 @@ import java.util.List;
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;
@@ -21,6 +22,13 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class OrdersGroupPackageDto {
/**
* 用于搭配Dict切面,无实际业务意义
*/
@Dict(dictCode = "test_field")
private String testField;
private String testField_dictText;
/**
* 组合套餐id
*/

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
View File

@@ -5,6 +5,7 @@ package com.openhis.web.personalization.dto;
import java.util.List;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -18,6 +19,13 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class OrdersGroupPackageUseDto {
/**
* 用于搭配Dict切面,无实际业务意义
*/
@Dict(dictCode = "test_field")
private String testField;
private String testField_dictText;
/**
* 个人组套
*/