版本更新

2025-10-16 17:17:24 +08:00
parent d23a594a4b
commit f515bb8fbb
600 changed files with 7881 additions and 35954 deletions
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
@@ -1,16 +1,17 @@
 package com.openhis.workflow.domain;

+import java.math.BigDecimal;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
 * 器材发放管理Entity实体
 *
@@ -36,9 +37,10 @@ public class DeviceDispense extends HisBaseEntity {
    /** 器材发放状态 */
    private Integer statusEnum;

+    // 暂时不要用
    /** 请求基于什么 */
    private String basedOnTable;
-
+    // 暂时不要用
    /** 请求基于什么的ID */
    private Long basedOnId;

@@ -111,4 +113,6 @@ public class DeviceDispense extends HisBaseEntity {
    /** 追溯码 */
    private String traceNo;

+    /** 执行id */
+    private Long procedureId;
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
@@ -165,4 +165,9 @@ public class DeviceRequest extends HisBaseEntity {
     */
    private Long encounterDiagnosisId;

+    /** 请求基于什么 */
+    private String basedOnTable;
+
+    /** 请求基于什么的ID */
+    private Long basedOnId;
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
@@ -6,9 +6,8 @@ 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 com.openhis.common.annotation.Dict;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -71,6 +70,12 @@ public class ElepMedicationRequest extends HisBaseEntity {
    /** 诊断id */
    private Long conditionId;

+    /** 诊断id */
+    private Long conditionDefId;
+
+    /** 慢病字段 */
+    private String opspDiseCode;
+
    /** 有效天数 */
    private Integer validityDays;

@@ -100,7 +105,7 @@ public class ElepMedicationRequest extends HisBaseEntity {
    /** 调配药师 */
    private Long dispensingDrId;

-    /**  发药药师*/
+    /** 发药药师 */
    private Long issuingDrId;

    /** 延长原因 */
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
@@ -5,14 +5,9 @@ import java.util.Date;
 import java.util.List;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.core.common.core.domain.model.LoginUser;
 import com.openhis.administration.domain.Practitioner;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import org.apache.ibatis.annotations.Param;

 /**
 * 器材发放管理Service接口
@@ -48,9 +43,10 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
    /**
     * 获取执行过的器材数据
     *
-     * @param basedOnId 请求基于什么的ID
+     * @param procedureIdList 执行id列表
+     * @return 操作结果
     */
-    List<DeviceDispense> selectDeviceDispenseByBasedOnId(Long basedOnId);
+    List<DeviceDispense> getDevDispenseByProcedureId(List<Long> procedureIdList);

    /**
     * 执行器材发放
@@ -111,12 +107,4 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
     * @param devDispenseId 发放id列表
     */
    void updateDispenseStatusSummarized(List<Long> devDispenseId);
-
-    /**
-     * 通过id获取耗材发放信息
-     *
-     * @param idList 发放id
-     * @return 发放信息
-     */
-    List<DeviceDispense> selectByIdList(@Param("idList") List<Long> idList);
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
@@ -8,10 +8,6 @@ import java.util.List;

 import javax.annotation.Resource;

-import com.core.common.utils.DateUtils;
-import com.openhis.common.enums.DelFlag;
-import com.openhis.medication.domain.MedicationDispense;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -19,9 +15,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.AssignSeqUtil;
 import com.openhis.administration.domain.Practitioner;
-import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.DbOpType;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.DispenseStatus;
 import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.DeviceRequest;
@@ -124,13 +120,14 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
    /**
     * 获取执行过的器材数据
     *
-     * @param basedOnId 请求基于什么的ID
+     * @param procedureIdList 执行id列表
+     * @return 操作结果
     */
    @Override
-    public List<DeviceDispense> selectDeviceDispenseByBasedOnId(Long basedOnId) {
-        return (baseMapper
-            .selectList(new LambdaQueryWrapper<DeviceDispense>().eq(DeviceDispense::getBasedOnId, basedOnId)
-                .eq(DeviceDispense::getStatusEnum, DispenseStatus.COMPLETED.getValue())));
+    public List<DeviceDispense> getDevDispenseByProcedureId(List<Long> procedureIdList) {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getProcedureId, procedureIdList)
+                .eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
    }

    /**
@@ -147,10 +144,10 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
        String step, BigDecimal quantity) {
        // 服务请求编码
        deviceDispense.setBusNo(deviceDispense.getBusNo() + "." + step);
-        // 请求基于什么
-        deviceDispense.setBasedOnTable(CommonConstants.TableName.WOR_DEVICE_DISPENSE);
-        // 请求基于什么的ID
-        deviceDispense.setBasedOnId(deviceDispense.getId());
+        // // 请求基于什么
+        // deviceDispense.setBasedOnTable(CommonConstants.TableName.WOR_DEVICE_DISPENSE);
+        // // 请求基于什么的ID
+        // deviceDispense.setBasedOnId(deviceDispense.getId());
        // 已发药数量
        deviceDispense.setDispenseQuantity(quantity);
        // 状态
@@ -258,17 +255,4 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
                .set(DeviceDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
                .in(DeviceDispense::getId, devDispenseId));
    }
-
-    /**
-     * 通过id获取耗材发放信息
-     *
-     * @param idList 发放id
-     * @return 发放信息
-     */
-    @Override
-    public List<DeviceDispense> selectByIdList(@Param("idList") List<Long> idList) {
-        return baseMapper.selectList(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, idList)
-            .eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
-    }
-
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
@@ -3,17 +3,15 @@ package com.openhis.workflow.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;

-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.EventStatus;
 import org.springframework.stereotype.Service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.DispenseStatus;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
@@ -93,11 +91,10 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl<SupplyDeliveryMapper,
    public boolean supplyDeliveryValidation(List<Long> supplyReqIdList) {

        // 根据请求id查询发放状态
-        List<SupplyDelivery> deliveryList = baseMapper
-            .selectList(new LambdaQueryWrapper<SupplyDelivery>().in(SupplyDelivery::getRequestId, supplyReqIdList));
+        List<SupplyDelivery> deliveryList = baseMapper.selectList(new LambdaQueryWrapper<SupplyDelivery>()
+            .eq(SupplyDelivery::getDeleteFlag, DelFlag.NO.getCode()).in(SupplyDelivery::getRequestId, supplyReqIdList));
        if (!deliveryList.isEmpty()) {
-            List<Integer> deliveryStatusList =
-                deliveryList.stream().map(SupplyDelivery::getStatusEnum).collect(Collectors.toList());
+            List<Integer> deliveryStatusList = deliveryList.stream().map(SupplyDelivery::getStatusEnum).toList();
            return deliveryStatusList.stream().anyMatch(x -> x.equals(DispenseStatus.COMPLETED.getValue()));
        }
        return false;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
@@ -4,7 +4,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

-import com.openhis.medication.domain.MedicationDispense;
 import org.springframework.stereotype.Service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,7 +40,8 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     */
    @Override
    public List<SupplyRequest> getSupplyByBusNo(String busNo) {
-        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
    }

    /**
@@ -51,9 +51,11 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     * @return 单据信息
     */
    @Override
-    public  List<SupplyRequest> getSupplyByOriginalBusNo(String originalBusNo){
-        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getOriginalBusNo, originalBusNo));
+    public List<SupplyRequest> getSupplyByOriginalBusNo(String originalBusNo) {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getOriginalBusNo, originalBusNo));
    }
+
    /**
     * 同意申请
     *
@@ -81,14 +83,14 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     * @return 单据详情
     */
    @Override
-    public List<SupplyRequest> addOriginalBusNo(String busNo,String originalBusNo){
+    public List<SupplyRequest> addOriginalBusNo(String busNo, String originalBusNo) {
        // 更新单据状态
-        baseMapper.update(null,
-            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
-                .set(SupplyRequest::getOriginalBusNo, originalBusNo));
+        baseMapper.update(null, new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+            .set(SupplyRequest::getOriginalBusNo, originalBusNo));
        // 返回单据详情
        return this.getSupplyByBusNo(busNo);
    }
+
    /**
     * 将原始单据号信息的原始单据号删除
     *
@@ -97,9 +99,8 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     */
    @Override
    public boolean updateByBusNo(String busNo) {
-        int updateCount = baseMapper.update(null,
-            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
-                .set(SupplyRequest::getOriginalBusNo, ""));
+        int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<SupplyRequest>()
+            .eq(SupplyRequest::getBusNo, busNo).set(SupplyRequest::getOriginalBusNo, ""));
        return updateCount > 0;
    }

@@ -110,12 +111,13 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     * @return 单据详情
     */
    @Override
-    public  boolean updateStatusEnumByBusNo(String busNo){
-        int updateCount = baseMapper.update(null,
-            new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
+    public boolean updateStatusEnumByBusNo(String busNo) {
+        int updateCount =
+            baseMapper.update(null, new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
                .set(SupplyRequest::getStatusEnum, SupplyStatus.EXPIRED_INVALIDATED.getValue()));
        return updateCount > 0;
    }
+
    /**
     * 提交审批
     *
@@ -145,6 +147,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
                .set(SupplyRequest::getStatusEnum, SupplyStatus.WITHDRAW.getValue()));
        return updateCount > 0;
    }
+
    /**
     * 删除单据
     *
@@ -152,12 +155,12 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     * @return 操作结果
     */
    @Override
-    public  boolean removeByBusNo(String busNo){
-        int updateCount = baseMapper.update(null,
-                new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
-                        .set(SupplyRequest::getDeleteFlag,DelFlag.YES.getCode() ));
+    public boolean removeByBusNo(String busNo) {
+        int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<SupplyRequest>()
+            .eq(SupplyRequest::getBusNo, busNo).set(SupplyRequest::getDeleteFlag, DelFlag.YES.getCode()));
        return updateCount > 0;
    }
+
    /**
     * 驳回申请
     *
@@ -234,7 +237,8 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     *
     * @param busNo 单据号
     */
-    @Override public boolean deleteRequest(String busNo) {
+    @Override
+    public boolean deleteRequest(String busNo) {
        // 更新单据状态
        int deleteCount = baseMapper.delete(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));

@@ -246,19 +250,22 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     *
     * @param supplyRequestIdList 供应申请id列表
     */
-    @Override public void updateCompletedStatusBatch(List<Long> supplyRequestIdList) {
+    @Override
+    public void updateCompletedStatusBatch(List<Long> supplyRequestIdList) {
        baseMapper.update(new SupplyRequest().setStatusEnum(SupplyStatus.AGREE.getValue())
-                .setApproverId(SecurityUtils.getLoginUser().getPractitionerId()).setApprovalTime(DateUtils.getNowDate()),
+            .setApproverId(SecurityUtils.getLoginUser().getPractitionerId()).setApprovalTime(DateUtils.getNowDate()),
            new LambdaUpdateWrapper<SupplyRequest>().in(SupplyRequest::getId, supplyRequestIdList));
    }
+
    /**
     * 根据id，获取供应申请列表
     *
     * @param requestIdList id列表
     * @return 供应发放列表
     */
-    @Override public  List<SupplyRequest> selectByIdList(List<Long> requestIdList){
-        return baseMapper.selectList( new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getId, requestIdList)
+    @Override
+    public List<SupplyRequest> selectByIdList(List<Long> requestIdList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getId, requestIdList)
            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
    }
 }