diff --git a/common-collect/src/main/java/com/docus/server/collect/IJob.java b/common-collect/src/main/java/com/docus/server/collect/IJob.java
index c653dfb..f451b18 100644
--- a/common-collect/src/main/java/com/docus/server/collect/IJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/IJob.java
@@ -5,10 +5,19 @@ import com.docus.server.collect.web.utils.PeriodTime;
 
 public interface IJob<T> {
 
+    /**
+     * 全量
+     */
     void startCollectAll(String taskConfigId);
 
+    /**
+     * 增量
+     */
     void startCollectIncrement(String taskConfigId);
 
+    /**
+     * 根据配置获取数据
+     */
     void get(PeriodTime periodTime, TaskConfig taskConfig);
 
 }
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/Test.java
similarity index 95%
rename from common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java
rename to common-collect/src/main/java/com/docus/server/collect/basic/http/test/Test.java
index d5deedd..c9bbc04 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/Test.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.basic.mq;
+package com.docus.server.collect.basic.http.test;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java
index 2ec6b2f..28b5044 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java
@@ -5,8 +5,8 @@ import com.docus.log.annotation.TrackGroup;
 import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.processor.VisitorProcessor;
+import com.docus.server.collect.web.service.CollectService;
 import com.docus.server.record.pojo.dto.TBasicDTO;
-import com.docus.server.record.service.ITBasicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +19,7 @@ import javax.annotation.Resource;
 @Service("basicJmsMqCollectServiceImpl")
 public class BasicJmsMqCollectServiceImpl implements IBasicMqCollectService {
     @Resource
-    private ITBasicService tBasicService;
+    private CollectService collectService;
 
     @Override
     @TrackGroup(
@@ -28,7 +28,7 @@ public class BasicJmsMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void addTBasic(String message) {
         log.info("新增基础数据：{}", message);
-        tBasicService.insertTBasic(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
     @Override
@@ -38,7 +38,7 @@ public class BasicJmsMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void updateTBasic(String message) {
         log.info("修改基础数据：{}", message);
-        tBasicService.updateTBasic(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
     public TBasicDTO getValue() {
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java
index 1d62dba..576a5e1 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java
@@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.processor.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
+import com.docus.server.record.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -33,7 +33,7 @@ public class BasicRabbitMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void addTBasic(String message) {
         log.info("注册基础数据 队列接收信息：{}", message);
-        collectService.insertOrUpdateDept(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
     /**
@@ -48,10 +48,10 @@ public class BasicRabbitMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void updateTBasic(String message) {
         log.info("变更基础数据 队列接收信息：{}", message);
-        collectService.insertOrUpdateDept(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
-    public DeptDTO getValue() {
-        return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), DeptDTO.class);
+    public TBasicDTO getValue() {
+        return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), TBasicDTO.class);
     }
 }
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java
index a61027d..013da84 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java
@@ -6,7 +6,7 @@ import com.docus.log.context.TrackHelper;
 import com.docus.server.collect.basic.mq.IBasicMqCollectService;
 import com.docus.server.collect.web.processor.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
+import com.docus.server.record.pojo.dto.TBasicDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +30,7 @@ public class BasicRocketMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void addTBasic(String message) {
         log.info("注册基础数据 队列接收信息：{}", message);
-        collectService.insertOrUpdateDept(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
     /**
@@ -45,10 +45,10 @@ public class BasicRocketMqCollectServiceImpl implements IBasicMqCollectService {
         processor = VisitorProcessor.class)
     public void updateTBasic(String message) {
         log.info("变更基础数据 队列接收信息：{}", message);
-        collectService.insertOrUpdateDept(getValue());
+        collectService.insertOrUpdateBasic(getValue());
     }
 
-    public DeptDTO getValue() {
-        return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), DeptDTO.class);
+    public TBasicDTO getValue() {
+        return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), TBasicDTO.class);
     }
 }
\ No newline at end of file
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java
index ae48530..d07f0cd 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java
+++ b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java
@@ -1,6 +1,8 @@
 package com.docus.server.collect.web.service;
 
 import com.docus.core.util.Func;
+import com.docus.server.record.pojo.dto.TBasicDTO;
+import com.docus.server.record.service.ITBasicService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.sys.service.IPowerDeptService;
@@ -17,13 +19,16 @@ public class CollectService {
     private IPowerDeptService deptService;
     @Resource
     private IPowerUserService userService;
+    @Resource
+    private ITBasicService tBasicService;
 
     /**
      * 默认3次重试
+     * 科室数据
      */
     /*@Async("recordMessage")
     @Retryable(value = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 2000L, multiplier = 1.5))*/
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void insertOrUpdateDept(DeptDTO deptDTO) {
         //异步写入归档系统，失败自动重试。
         if (checkType(deptDTO.getOperateType(), DEL_TYPE)) {
@@ -33,7 +38,12 @@ public class CollectService {
         }
     }
 
-    @Transactional
+    /**
+     * 用户信息
+     *
+     * @param userDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
     public void insertOrUpdateUser(UserDTO userDTO) {
         // 判断操作类型
         if (checkType(userDTO.getOperateType(), DEL_TYPE)) {
@@ -43,6 +53,21 @@ public class CollectService {
         }
     }
 
+    /**
+     * 基础数据
+     *
+     * @param tBasicDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void insertOrUpdateBasic(TBasicDTO tBasicDTO) {
+        Integer num = tBasicService.findByJzh(tBasicDTO.getJzh());
+        if (num > 0) {
+            tBasicService.updateTBasic(tBasicDTO);
+        } else {
+            tBasicService.insertTBasic(tBasicDTO);
+        }
+    }
+
 
     protected boolean checkType(String operateType, String delType) {
         return Func.isNotEmpty(operateType)
diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java
index 7a0d84e..9ade6aa 100644
--- a/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java
+++ b/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java
@@ -28,4 +28,12 @@ public interface ITBasicService {
      * @param basicDTOList
      */
     void batchSaveBasics(List<TBasicDTO> basicDTOList);
+
+    /**
+     * 根据记账号查询数据
+     *
+     * @param jzh
+     * @return
+     */
+    Integer findByJzh(String jzh);
 }
diff --git a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java
index d57eef7..ac1210d 100644
--- a/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java
+++ b/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java
@@ -203,6 +203,12 @@ public class TBasicServiceImpl extends ServiceImpl<TBasicMapper, TBasic> impleme
     public void batchSaveBasics(List<TBasicDTO> basicDTOList) {
         basicDTOList.forEach(this::updateTBasic);
     }
+
+    @Override
+    public Integer findByJzh(String jzh) {
+        //判断jzh是否重复
+        return tBasicMapper.selectOne(jzh);
+    }
 }