器材,诊疗目录更新

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java

@@ -1,13 +1,11 @@
 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 com.openhis.common.enums.PublicationStatus;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -59,7 +57,7 @@ public class ActivityDefinition extends HisBaseEntity {
     private Integer ybMatchFlag;
 
     /** 状态 */
-    private Integer statusEnum;
+    private PublicationStatus statusEnum;
 
     /** 身体部位 */
     private String bodySiteCode;
@@ -68,10 +66,9 @@ public class ActivityDefinition extends HisBaseEntity {
     private String specimenCode;
 
     /** 说明 */
-    private String description;
+    private String descriptionText;
 
     /** 规则id */
     private Integer ruleId;
 
-
 }

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java

@@ -11,4 +11,19 @@ import com.openhis.workflow.domain.ActivityDefinition;
  */
 public interface IActivityDefinitionService extends IService<ActivityDefinition> {
 
+    /**
+     * 新增诊疗目录
+     *
+     * @param activityDefinition 诊疗目录实体
+     * @return
+     */
+    boolean addDiagnosisTreatment(ActivityDefinition activityDefinition);
+
+    /**
+     * 新增医保诊疗目录
+     *
+     * @param activityDefinition 诊疗目录实体
+     * @return
+     */
+    boolean addYbDiagnosisTreatment(ActivityDefinition activityDefinition);
 }

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java

@@ -1,19 +1,58 @@
 package com.openhis.workflow.service.impl;
 
-import org.springframework.stereotype.Service;
+import java.util.List;
 
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.mapper.ActivityDefinitionMapper;
 import com.openhis.workflow.service.IActivityDefinitionService;
 
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 诊疗定义管理Service业务层处理
  *
  * @author system
  * @date 2025-02-20
  */
+@Slf4j
 @Service
-public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitionMapper, ActivityDefinition> implements IActivityDefinitionService {
+@AllArgsConstructor
+public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitionMapper, ActivityDefinition>
+    implements IActivityDefinitionService {
+    private final ActivityDefinitionMapper activityDefinitionMapper;
 
+    /**
+     * 增加外来诊疗项目
+     * 
+     * @param activityDefinition 诊疗项目实体
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addDiagnosisTreatment(ActivityDefinition activityDefinition) {
+        // 根据诊疗编码判断诊疗项目是否存在
+        List<ActivityDefinition> activityDefinitions =
+            activityDefinitionMapper.selectList(new LambdaQueryWrapper<ActivityDefinition>()
+                .eq(ActivityDefinition::getBusNo, activityDefinition.getBusNo()));
+        if (activityDefinitions.size() > 0) {
+            return false;
+        }
+        // 新增诊疗项目
+        int insert = activityDefinitionMapper.insert(activityDefinition);
+        if (insert != 1) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean addYbDiagnosisTreatment(ActivityDefinition activityDefinition) {
+        return false;
+    }
 }