提交merge1.3

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

@@ -188,4 +188,22 @@ public interface ICommonService {
      * @return 诊疗项目
      */
     R<?> getActivityDefinition();
+<<<<<<< HEAD
+=======
+
+    /**
+     * 查询备份单号
+     *
+     * @return 备份单号列表
+     */
+    R<?> getBackupNoList();
+
+    /**
+     * 批号匹配
+     *
+     * @param encounterIdList 就诊id列表
+     * @return 处理结果
+     */
+    R<?> lotNumberMatch(List<Long> encounterIdList);
+>>>>>>> v1.3
 }

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

@@ -3,6 +3,8 @@
  */
 package com.openhis.web.common.appservice.impl;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -16,7 +18,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.enums.DelFlag;
 import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
@@ -33,13 +37,20 @@ import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.document.domain.DocInventoryItemStatic;
+import com.openhis.document.service.IDocInventoryItemStaticService;
 import com.openhis.financial.domain.Contract;
 import com.openhis.financial.mapper.ContractMapper;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.web.chargemanage.dto.ContractMetadata;
 import com.openhis.web.common.appservice.ICommonService;
 import com.openhis.web.common.dto.*;
 import com.openhis.web.common.mapper.CommonAppMapper;
+import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
+import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IInventoryItemService;
 
 /**
@@ -51,6 +62,9 @@ import com.openhis.workflow.service.IInventoryItemService;
 @Service
 public class CommonServiceImpl implements ICommonService {
 
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
     @Resource
     private TraceNoManageMapper traceNoManageMapper;
 
@@ -75,6 +89,18 @@ public class CommonServiceImpl implements ICommonService {
     @Resource
     private ISupplierService supplierService;
 
+<<<<<<< HEAD
+=======
+    @Resource
+    private IDocInventoryItemStaticService iDocInventoryItemStaticService;
+
+    @Resource
+    private IMedicationDispenseService medicationDispenseService;
+
+    @Resource
+    private IDeviceDispenseService deviceDispenseService;
+
+>>>>>>> v1.3
     /**
      * 获取药房列表
      *
@@ -444,7 +470,8 @@ public class CommonServiceImpl implements ICommonService {
         // 查询当前登录者管理的病区
         Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
         List<Long> locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId);
-        List<Location> locationList = locationService.getLocationList(locationIds);
+        List<Location> locationList =
+            locationService.getLocationList(locationIds, Collections.singletonList(LocationStatus.ACTIVE.getValue()));
         List<Location> wardList = new ArrayList<>();
         for (Location ward : locationList) {
             if (LocationForm.WARD.getValue().equals(ward.getFormEnum())) {
@@ -496,6 +523,10 @@ public class CommonServiceImpl implements ICommonService {
                 EnumUtils.getInfoByValue(AdministrativeGender.class, advicePrintInfoDto.getGenderEnum()))
             .setEncounterYbClass_enumText(
                 EnumUtils.getInfoByValue(EncounterYbClass.class, advicePrintInfoDto.getEncounterYbClass()));
+        if (advicePrintInfoDto.getChrgitmLv() != null) {
+            advicePrintInfoDto
+                    .setChrgitmLv_enumText(EnumUtils.getInfoByValue(InsuranceLevel.class, advicePrintInfoDto.getChrgitmLv()));
+        }
         return R.ok(advicePrintInfoDto);
     }
 
@@ -532,4 +563,267 @@ public class CommonServiceImpl implements ICommonService {
         return R.ok(commonAppMapper.getActivityDefinition(PublicationStatus.ACTIVE.getValue()));
     }
 
+<<<<<<< HEAD
+=======
+    /**
+     * 查询备份单号
+     *
+     * @return 备份单号列表
+     */
+    @Override
+    public R<?> getBackupNoList() {
+        List<DocInventoryItemStatic> docInventoryItemStaticList =
+            iDocInventoryItemStaticService.list(new LambdaQueryWrapper<DocInventoryItemStatic>()
+                .eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
+                .eq(DocInventoryItemStatic::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
+        if (docInventoryItemStaticList.isEmpty()) {
+            return null;
+        }
+        // 直接去重并按BusNo倒序排序
+        List<String> busNoList = docInventoryItemStaticList.stream().map(DocInventoryItemStatic::getBusNo).distinct() // 去重
+            .sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+        return R.ok(busNoList);
+    }
+
+    /**
+     * 批号匹配
+     *
+     * @param encounterIdList 就诊id列表
+     * @return 处理结果
+     */
+    @Override
+    public R<?> lotNumberMatch(List<Long> encounterIdList) {
+        // 查询患者待发放的药品信息
+        List<MedicationDispense> medicationDispenseList = medicationDispenseService
+            .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getEncounterId, encounterIdList)
+                .eq(MedicationDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue())
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+        // 药品批号匹配
+        if (medicationDispenseList != null && !medicationDispenseList.isEmpty()) {
+            // 获取待发放的药品id
+            List<Long> medicationIdList =
+                medicationDispenseList.stream().map(MedicationDispense::getMedicationId).distinct().toList();
+            // 获取发药药房
+            List<Long> locationIdList =
+                medicationDispenseList.stream().map(MedicationDispense::getLocationId).distinct().toList();
+
+            // 查询待发放药品的库存明细
+            List<InventoryDetailDto> inventoryDetailList = commonAppMapper
+                .selectMedicineInventoryDetail(medicationIdList, locationIdList, PublicationStatus.ACTIVE.getValue());
+            if (inventoryDetailList == null || inventoryDetailList.isEmpty()) {
+                return R.fail("发药单生成失败，请检查药品库存");
+            }
+            // 将库存信息根据药品id和库房id进行分组
+            Map<String, List<InventoryDetailDto>> inventoryDetailMap = inventoryDetailList.stream()
+                .collect(Collectors.groupingBy(x -> x.getItemId() + CommonConstants.Common.DASH + x.getLocationId()));
+            // 按照效期排序（先进先出）
+            for (List<InventoryDetailDto> inventoryList : inventoryDetailMap.values()) {
+                inventoryList.sort(Comparator.comparing(InventoryDetailDto::getExpirationDate));
+            }
+
+            // 使用索引循环，以便处理后续添加的拆分单
+            int currentIndex = 0;
+            while (currentIndex < medicationDispenseList.size()) {
+                MedicationDispense medicationDispense = medicationDispenseList.get(currentIndex);
+                currentIndex++;
+                // 根据发放药品和发放药房做key
+                String inventoryKey = medicationDispense.getMedicationId() + CommonConstants.Common.DASH
+                    + medicationDispense.getLocationId();
+                // 查询对应的库存信息
+                if (!inventoryDetailMap.containsKey(inventoryKey)) {
+                    return R.fail("药品库存不存在，药品ID: " + medicationDispense.getMedicationId());
+                }
+                List<InventoryDetailDto> inventoryList = inventoryDetailMap.get(inventoryKey);
+
+                // 获取发药数量
+                BigDecimal dispenseQuantity = medicationDispense.getQuantity();
+                // 循环库存信息
+                for (InventoryDetailDto inventoryDetailDto : inventoryList) {
+                    // 发药数量不能小于等于0
+                    if (dispenseQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                        break;
+                    }
+                    // 库存剩余数量不能小于等于0
+                    if (inventoryDetailDto.getInventoryQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+                        continue;
+                    }
+                    // 发药数量单位转换
+                    if (!inventoryDetailDto.getInventoryUnitCode().equals(medicationDispense.getUnitCode())) {
+                        dispenseQuantity = dispenseQuantity.multiply(inventoryDetailDto.getPartPercent());
+                    }
+
+                    // 获取库存剩余数量
+                    BigDecimal remainingInventoryQuantity =
+                        inventoryDetailDto.getInventoryQuantity().subtract(dispenseQuantity);
+                    // 如果剩余库存数量大于等于0，则说明当前批号库存充足
+                    if (remainingInventoryQuantity.compareTo(BigDecimal.ZERO) >= 0) {
+                        medicationDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
+                        // 将该批号的库存数量重置为剩余数量
+                        inventoryDetailDto.setInventoryQuantity(remainingInventoryQuantity);
+                    } else {
+                        // 发药数量单位转换
+                        if (!inventoryDetailDto.getInventoryUnitCode().equals(medicationDispense.getUnitCode())) {
+                            // 发药数量取库存大单位数量
+                            dispenseQuantity = inventoryDetailDto.getInventoryQuantity()
+                                .divide(inventoryDetailDto.getPartPercent(), 0, RoundingMode.HALF_UP);
+                            // 大单位数量不足则跳出循环
+                            if (dispenseQuantity.compareTo(BigDecimal.ZERO) == 0) {
+                                continue;
+                            }
+                        } else {
+                            // 发药数量取该批号剩余数量
+                            dispenseQuantity = inventoryDetailDto.getInventoryQuantity();
+                        }
+
+                        // 如果剩余数量不足则进行拆分
+                        MedicationDispense splitMedicationDispense = new MedicationDispense();
+                        BeanUtils.copyProperties(medicationDispense, splitMedicationDispense);
+                        // 数量拆分
+                        splitMedicationDispense.setQuantity(medicationDispense.getQuantity().subtract(dispenseQuantity))
+                            // 重置id与批号
+                            .setId(null).setLotNumber(null)
+                            // 重新生成发药单编码
+                            .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
+                        // 将拆分出来的发药单添加到原发药单列表中
+                        medicationDispenseList.add(splitMedicationDispense);
+
+                        // 更新原发药单
+                        medicationDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
+                        medicationDispense.setQuantity(dispenseQuantity);
+                        // 将该批号的库存数量重置为0
+                        inventoryDetailDto.setInventoryQuantity(BigDecimal.ZERO);
+                    }
+                    break;
+                }
+            }
+            // 校验药品库存
+            for (MedicationDispense medicationDispense : medicationDispenseList) {
+                if (medicationDispense.getLotNumber() == null) {
+                    return R.fail("药品:" + medicationDispense.getMedicationId() + "库存不足，请检查药品库存");
+                }
+            }
+            // 新增或更新发药单
+            boolean result = medicationDispenseService.saveOrUpdateBatch(medicationDispenseList);
+            if (!result) {
+                return R.fail("发药单生成失败，请联系管理员");
+            }
+        }
+        // 查询患者待发放的耗材信息
+        List<DeviceDispense> deviceDispenseList = deviceDispenseService
+            .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getEncounterId, encounterIdList)
+                .eq(DeviceDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue())
+                .eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
+        // 耗材批号匹配
+        if (deviceDispenseList != null && !deviceDispenseList.isEmpty()) {
+            // 获取待发放的耗材id
+            List<Long> deviceIdList =
+                deviceDispenseList.stream().map(DeviceDispense::getDeviceDefId).distinct().toList();
+            // 获取发耗材房
+            List<Long> locationIdList =
+                deviceDispenseList.stream().map(DeviceDispense::getLocationId).distinct().toList();
+
+            // 查询待发放耗材的库存明细
+            List<InventoryDetailDto> inventoryDetailList = commonAppMapper.selectDeviceInventoryDetail(deviceIdList,
+                locationIdList, PublicationStatus.ACTIVE.getValue());
+            if (inventoryDetailList == null || inventoryDetailList.isEmpty()) {
+                return R.fail("发耗材单生成失败，请检查耗材库存");
+            }
+            // 将库存信息根据耗材id和库房id进行分组
+            Map<String, List<InventoryDetailDto>> inventoryDetailMap = inventoryDetailList.stream()
+                .collect(Collectors.groupingBy(x -> x.getItemId() + CommonConstants.Common.DASH + x.getLocationId()));
+            // 按照效期排序（先进先出）
+            for (List<InventoryDetailDto> inventoryList : inventoryDetailMap.values()) {
+                inventoryList.sort(Comparator.comparing(InventoryDetailDto::getExpirationDate));
+            }
+
+            // 使用索引循环，以便处理后续添加的拆分单
+            int currentIndex = 0;
+            while (currentIndex < deviceDispenseList.size()) {
+                DeviceDispense deviceDispense = deviceDispenseList.get(currentIndex);
+                currentIndex++;
+                // 根据发放耗材和发放耗材房做key
+                String inventoryKey =
+                    deviceDispense.getDeviceDefId() + CommonConstants.Common.DASH + deviceDispense.getLocationId();
+                // 查询对应的库存信息
+                if (!inventoryDetailMap.containsKey(inventoryKey)) {
+                    return R.fail("耗材库存不存在，耗材ID: " + deviceDispense.getDeviceDefId());
+                }
+                List<InventoryDetailDto> inventoryList = inventoryDetailMap.get(inventoryKey);
+
+                // 获取发耗材数量
+                BigDecimal dispenseQuantity = deviceDispense.getQuantity();
+                // 循环库存信息
+                for (InventoryDetailDto inventoryDetailDto : inventoryList) {
+                    // 发耗材数量不能小于等于0
+                    if (dispenseQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                        break;
+                    }
+                    // 库存剩余数量不能小于等于0
+                    if (inventoryDetailDto.getInventoryQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+                        continue;
+                    }
+                    // 发耗材数量单位转换
+                    if (!inventoryDetailDto.getInventoryUnitCode().equals(deviceDispense.getUnitCode())) {
+                        dispenseQuantity = dispenseQuantity.multiply(inventoryDetailDto.getPartPercent());
+                    }
+
+                    // 获取库存剩余数量
+                    BigDecimal remainingInventoryQuantity =
+                        inventoryDetailDto.getInventoryQuantity().subtract(dispenseQuantity);
+                    // 如果剩余库存数量大于等于0，则说明当前批号库存充足
+                    if (remainingInventoryQuantity.compareTo(BigDecimal.ZERO) >= 0) {
+                        deviceDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
+                        // 将该批号的库存数量重置为剩余数量
+                        inventoryDetailDto.setInventoryQuantity(remainingInventoryQuantity);
+                    } else {
+                        // 发耗材数量单位转换
+                        if (!inventoryDetailDto.getInventoryUnitCode().equals(deviceDispense.getUnitCode())) {
+                            // 发耗材数量取库存大单位数量
+                            dispenseQuantity = inventoryDetailDto.getInventoryQuantity()
+                                .divide(inventoryDetailDto.getPartPercent(), 0, RoundingMode.HALF_UP);
+                            // 大单位数量不足则跳出循环
+                            if (dispenseQuantity.compareTo(BigDecimal.ZERO) == 0) {
+                                continue;
+                            }
+                        } else {
+                            // 发耗材数量取该批号剩余数量
+                            dispenseQuantity = inventoryDetailDto.getInventoryQuantity();
+                        }
+
+                        // 如果剩余数量不足则进行拆分
+                        DeviceDispense splitDeviceDispense = new DeviceDispense();
+                        BeanUtils.copyProperties(deviceDispense, splitDeviceDispense);
+                        // 数量拆分
+                        splitDeviceDispense.setQuantity(deviceDispense.getQuantity().subtract(dispenseQuantity))
+                            // 重置id与批号
+                            .setId(null).setLotNumber(null)
+                            // 重新生成发耗材单编码
+                            .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
+                        // 将拆分出来的发耗材单添加到原发耗材单列表中
+                        deviceDispenseList.add(splitDeviceDispense);
+
+                        // 更新原发耗材单
+                        deviceDispense.setLotNumber(inventoryDetailDto.getInventoryLotNumber());
+                        deviceDispense.setQuantity(dispenseQuantity);
+                        // 将该批号的库存数量重置为0
+                        inventoryDetailDto.setInventoryQuantity(BigDecimal.ZERO);
+                    }
+                    break;
+                }
+            }
+            // 校验耗材库存
+            for (DeviceDispense deviceDispense : deviceDispenseList) {
+                if (deviceDispense.getLotNumber() == null) {
+                    return R.fail("耗材:" + deviceDispense.getDeviceDefId() + "库存不足，请检查耗材库存");
+                }
+            }
+            // 新增或更新发耗材单
+            boolean result = deviceDispenseService.saveOrUpdateBatch(deviceDispenseList);
+            if (!result) {
+                return R.fail("发耗材单生成失败，请联系管理员");
+            }
+        }
+        return R.ok();
+    }
+>>>>>>> v1.3
 }

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

@@ -220,6 +220,40 @@ public class CommonAppController {
     @GetMapping("/advice-print")
     public R<?> getAdvicePrintInfo(@RequestParam(value = "requestIds") List<Long> requestIds, String isPrescription) {
         return commonService.getAdvicePrintInfo(requestIds, isPrescription);
+<<<<<<< HEAD
+    }
+
+    /**
+     * 查询参与者签名
+     * 
+     * @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();
+=======
+>>>>>>> v1.3
     }
 
     /**
@@ -253,4 +287,24 @@ public class CommonAppController {
         return commonService.getActivityDefinition();
     }
 
+    /**
+     * 查询备份单号
+     *
+     * @return 备份单号列表
+     */
+    @GetMapping(value = "/backup-list")
+    public R<?> getBackupNoList() {
+        return commonService.getBackupNoList();
+    }
+
+    /**
+     * 批号匹配
+     *
+     * @param encounterIdList 就诊id列表
+     * @return 处理结果
+     */
+    @GetMapping("/lot-number-match")
+    public R<?> lotNumberMatch(@RequestParam(value = "encounterIdList") List<Long> encounterIdList) {
+        return commonService.lotNumberMatch(encounterIdList);
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java

@@ -92,4 +92,19 @@ public class AdviceItemPrintInfoDto {
      * 排序号
      */
     private Integer sortNumber;
+
+    /**
+     * 中药付数
+     */
+    private BigDecimal chineseHerbsDoseQuantity;
+
+    /**
+     * 医保等级甲乙类
+     */
+    private String chrgitmLv;
+
+    /**
+     * 是否基药
+     */
+    private Integer basicFlag;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java

@@ -7,8 +7,6 @@ import java.util.Date;
 import java.util.List;
 
 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;
@@ -93,6 +91,22 @@ public class AdvicePrintInfoDto {
     private String unitCode;
     private String unitCode_dictText;
 
+    /**
+     * 医保等级
+     */
+    private Integer chrgitmLv;
+    private String chrgitmLv_enumText;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 患者id
+     */
+    private String patientId;
+
     /**
      * 医嘱项目打印列表
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java

@@ -30,10 +30,14 @@ public class PerformRecordDto {
     private Integer statusEnum;
     private String statusEnum_enumText;
 
-    /** 执行时间 */
+    /** 预计执行时间 */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date occurrenceTime;
 
+    /** 实际执行时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordedTime;
+
     /** 执行位置 */
     private String locationName;
 

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.administration.domain.TraceNoManage;
 import com.openhis.web.common.dto.*;
+import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
 
 /**
  * app常用接口 mapper
@@ -104,4 +105,29 @@ public interface CommonAppMapper {
      * @return 诊疗项目
      */
     List<ActivityDefinitionDto> getActivityDefinition(@Param("statusEnum") Integer statusEnum);
+<<<<<<< HEAD
+=======
+
+    /**
+     * 查询药品库存详细信息
+     *
+     * @param medicationIdList 药品id列表
+     * @param locationIdList 库房id列表
+     * @param active 库存状态：启用
+     * @return 库存详细信息
+     */
+    List<InventoryDetailDto> selectMedicineInventoryDetail(@Param("medicationIdList") List<Long> medicationIdList,
+        @Param("locationIdList") List<Long> locationIdList, @Param("active") Integer active);
+
+    /**
+     * 查询耗材库存详细信息
+     *
+     * @param deviceIdList 耗材id列表
+     * @param locationIdList 库房id列表
+     * @param active 库存状态：启用
+     * @return 库存详细信息
+     */
+    List<InventoryDetailDto> selectDeviceInventoryDetail(@Param("deviceIdList") List<Long> deviceIdList,
+        @Param("locationIdList") List<Long> locationIdList, @Param("active") Integer active);
+>>>>>>> v1.3
 }