版本更新

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/clinical/service/IConditionDefinitionService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
@@ -1,10 +1,12 @@
 package com.openhis.clinical.service;

+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.ConditionDefinition;

-import java.util.List;
-
 /**
 * 诊断定义管理Service接口
 *
@@ -36,4 +38,21 @@ public interface IConditionDefinitionService extends IService<ConditionDefinitio
     * @return 诊断定义集合
     */
    List<ConditionDefinition> getConditionDefinitionListByIds(List<Long> collect);
+
+    /**
+     * 根据名称查询诊断定义
+     *
+     * @param searchKey 目标字符
+     * @return 诊断定义集合
+     */
+    List<ConditionDefinition> getConditionDefinitionListBySearchKey(String searchKey, HttpServletRequest request);
+
+    /**
+     * 诊断定义查询
+     * 
+     * @param conditionDefId 诊断定义id
+     * @return 查询结果
+     */
+    ConditionDefinition getConditionDefinitionListById(Long conditionDefId);
+
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
@@ -1,5 +1,6 @@
 package com.openhis.clinical.service;

+import java.util.Date;
 import java.util.List;

 import com.baomidou.mybatisplus.extension.service.IService;
@@ -35,12 +36,14 @@ public interface IProcedureService extends IService<Procedure> {
     * @param eventStatus 执行状态
     * @param procedureCategory 执行种类
     * @param locationId 执行位置
+     * @param exeDate 执行时间
     * @param groupId 组号
     * @param refundId 取消执行id
-     * @return 是否成功
+     * @return 执行id
     */
-    boolean addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
-        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Long groupId, Long refundId);
+    Long addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
+        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date exeDate, Long groupId,
+        Long refundId);

    /**
     * 添加药品执行记录
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
@@ -1,16 +1,22 @@
 package com.openhis.clinical.service.impl;

+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;

-import com.openhis.common.enums.DelFlag;
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
 import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.utils.HisQueryUtils;

 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -72,4 +78,31 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
        return baseMapper.selectList(new LambdaQueryWrapper<ConditionDefinition>()
            .in(ConditionDefinition::getId, collect).eq(ConditionDefinition::getDescription, DelFlag.NO.getCode()));
    }
+
+    /**
+     * 根据名称查询诊断定义
+     *
+     * @param searchKey 目标字符
+     * @return 诊断定义集合
+     */
+    @Override
+    public List<ConditionDefinition> getConditionDefinitionListBySearchKey(String searchKey,
+        HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<ConditionDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
+            new HashSet<>(Arrays.asList("condition_code", "name", "py_str", "wb_str")), request);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 诊断定义查询
+     * 
+     * @param conditionDefId 诊断定义id
+     * @return 查询结果
+     */
+    @Override
+    public ConditionDefinition getConditionDefinitionListById(Long conditionDefId) {
+        return baseMapper
+            .selectOne(new LambdaQueryWrapper<ConditionDefinition>().eq(ConditionDefinition::getId, conditionDefId));
+    }
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
@@ -60,14 +60,15 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
     * @param eventStatus 执行状态
     * @param procedureCategory 执行种类
     * @param locationId 执行位置
+     * @param exeDate 执行时间
     * @param groupId 组号
     * @param refundId 取消执行id
     * @return 是否成功
     */
    @Override
-    public boolean addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
-        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Long groupId, Long refundId) {
-        Date now = DateUtils.getNowDate();
+    public Long addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
+        EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date exeDate, Long groupId,
+        Long refundId) {
        Long orgId = SecurityUtils.getLoginUser().getOrgId();
        Procedure procedure = new Procedure();
        procedure
@@ -82,7 +83,7 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
            // 患者id
            .setPatientId(patientId)
            // 执行时间
-            .setOccurrenceTime(now)
+            .setOccurrenceTime(exeDate)
            // 执行状态
            .setStatusEnum(eventStatus.getValue())
            // 执行种类
@@ -101,10 +102,14 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
        int result = baseMapper.insert(procedure);
        if (result > 0) {
            // 添加执行人子表
-            return procedurePerformerService.addPerformRecord(procedure.getId(), now);
+            boolean performerResult = procedurePerformerService.addPerformRecord(procedure.getId(), exeDate);
+            if (!performerResult) {
+                return null;
+            }
        } else {
-            return false;
+            return null;
        }
+        return procedure.getId();
    }

    /**