Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
@@ -125,17 +124,4 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         }
         return data;
     }
-
-    /**
-     * 根据标签名获取标签信息
-     * @param questionInfo
-     * @return
-     */
-    public QuestionInfo getQuestionInfos(QuestionInfo questionInfo){
-        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<QuestionInfo>();
-        queryWrapper.eq("is_deleted", "N");
-        queryWrapper.eq("type", 1);
-        queryWrapper.eq("name",questionInfo.getName());
-        return this.getOne(queryWrapper);
-    }
 }

icss-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -3,7 +3,6 @@ package com.diagbot.web;
 
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionVO;
@@ -54,16 +53,4 @@ public class QuestionInfoController {
         Map<Long, Object> data = questionFacade.getByIds(questionIdsVO);
         return RespDTO.onSuc(data);
     }
-
-
-    /**
-     * 获取疾病标签信息，远程调用[by:wangyu]
-     * @param questionInfo
-     * @return
-     */
-    @PostMapping("/getQuestionInfos")
-    public RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo){
-        QuestionInfo data = questionFacade.getQuestionInfos(questionInfo);
-        return RespDTO.onSuc(data);
-    }
 }

icssman-service/src/main/java/com/diagbot/client/IcssServiceClient.java

@@ -1,26 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.IcssServiceHystrix;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.vo.DeptInfoVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/3 17:46
- */
-@FeignClient(value = "icss-service", fallback = IcssServiceHystrix.class)
-public interface IcssServiceClient {
-    @PostMapping("/deptInfo/getDeptInfo")
-    RespDTO<List<DeptInfoDTO>> getDeptInfo(@RequestBody DeptInfoVO deptInfoVO);
-
-    @PostMapping("/questionInfo/getQuestionInfos")
-    RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo);
-}

icssman-service/src/main/java/com/diagbot/client/hystrix/IcssServiceHystrix.java

@@ -1,33 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.IcssServiceClient;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.vo.DeptInfoVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description: 调用Icss服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-@Slf4j
-public class IcssServiceHystrix implements IcssServiceClient {
-    @Override
-    public RespDTO<List<DeptInfoDTO>> getDeptInfo(DeptInfoVO deptInfoVO) {
-        log.error("【hystrix】调用{}异常", "getDeptInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<QuestionInfo> getQuestionInfos(QuestionInfo questionInfo) {
-        log.error("【hystrix】调用{}异常", "getQuestionInfos");
-        return null;
-    }
-}

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -14,7 +15,6 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
-import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -44,9 +44,13 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      */
     public Boolean saveDeptVitals(DeptVitalVO deptVitalVO) {
         //先删除该科室原有模板
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId());
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                eq("is_deleted",IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(),deptVitalUpdateWrapper);
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
@@ -88,10 +92,14 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      * @return
      */
     public Boolean delDeptVitalList(DeptVitalVO deptVitalVO) {
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                in("vital_id", deptVitalVO.getVitalIds());
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                in("vital_id", deptVitalVO.getVitalIds()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
         return true;
     }
 
@@ -101,9 +109,13 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
      * @return
      */
     public Boolean delAllDeptVitalList(Long deptId) {
-        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<DeptVital>();
-        deptVitalQueryWrapper.eq("dept_id", deptId);
-        this.remove(deptVitalQueryWrapper);
+        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+        deptVitalUpdateWrapper.eq("dept_id", deptId).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
         return true;
     }
 

icssman-service/src/main/java/com/diagbot/facade/IntroduceDetailFacade.java

@@ -1,9 +1,12 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -18,6 +21,7 @@ public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
 
     /**
      * 获取提示信息明细
+     *
      * @param introduceId
      * @return
      */
@@ -27,4 +31,38 @@ public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
                 eq("introduce_id", introduceId);
         return this.list(introduceDetailQueryWrapper);
     }
-}
+
+    /**
+     * 单条删除提示信息明细 逻辑删除
+     *
+     * @param id
+     * @return
+     */
+    public Boolean deleteRecord(Long id) {
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.eq("id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
+        return true;
+    }
+
+    /**
+     * 批量删除提示信息明细 逻辑删除
+     *
+     * @param ids
+     * @return
+     */
+    public Boolean deleteRecords(Long[] ids) {
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.in("id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
+        return true;
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -1,14 +1,17 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.service.impl.IntroduceMapServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroduceDetailVO;
 import com.diagbot.vo.IntroduceMapVO;
@@ -18,8 +21,6 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,10 +51,10 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         if (!(introduceVO.getId() == null)) {
             introduceInfo = this.getById(introduceVO.getId());
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtModified(new Date());
+            introduceInfo.setGmtModified(DateUtil.now());
         } else {
             introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtCreate(new Date());
+            introduceInfo.setGmtCreate(DateUtil.now());
         }
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
@@ -62,18 +63,22 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         this.saveOrUpdate(introduceInfo);
 
         //明细信息不更新，每次都删除重新插入
-        //删除已有明细，物理删除
+        //删除已有明细，逻辑删除
         if (!(introduceInfo.getId() == null)) {
-            QueryWrapper<IntroduceDetail> detailQueryWrapper = new QueryWrapper<>();
-            detailQueryWrapper.eq("introduce_id", introduceInfo.getId());
-            introduceDetailFacade.remove(detailQueryWrapper);
+            UpdateWrapper<IntroduceDetail> detailUpdateWrapper = new UpdateWrapper<>();
+            detailUpdateWrapper.eq("introduce_id", introduceInfo.getId()).
+                    eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    set("is_deleted", IsDeleteEnum.Y.getKey()).
+                    set("modifier", UserUtils.getCurrentPrincipleID()).
+                    set("gmt_modified", DateUtil.now());
+            introduceDetailFacade.update(new IntroduceDetail(), detailUpdateWrapper);
         }
         List<IntroduceDetail> introduceDetailList = Lists.newArrayList();
         for (IntroduceDetailVO detailVO : introduceVO.getDetailVOList()) {
             IntroduceDetail detail = new IntroduceDetail();
             detail.setIntroduceId(introduceInfo.getId());
             detail.setCreator(UserUtils.getCurrentPrincipleID());
-            detail.setGmtCreate(new Date());
+            detail.setGmtCreate(DateUtil.now());
             detail.setContent(detailVO.getContent());
             detail.setText(detailVO.getText());
             detail.setTitle(detailVO.getTitle());
@@ -87,9 +92,13 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         //更新映射关系
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("introduce_id", introduceInfo.getId());
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.eq("introduce_id", introduceInfo.getId()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //插入新的映射关系
         List<IntroduceMap> introduceMapList = Lists.newLinkedList();
         for (IntroduceMapVO introduceMapVO : introduceVO.getMapVOList()) {
@@ -103,42 +112,70 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     }
 
     /**
-     * 单条删除提示信息 物理删除
+     * 单条删除提示信息 逻辑删除
      *
      * @param id
      * @return
      */
     public Boolean deleteRecord(Long id) {
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.eq("introduce_id", id);
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.eq("introduce_id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //删除明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("introduce_id", id);
-        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.eq("introduce_id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
         //删除提示信息
-        this.removeById(id);
+        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
+        introduceInfoUpdateWrapper.eq("id", id).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
         return true;
     }
 
     /**
-     * 批量删除提示信息 物理删除
+     * 批量删除提示信息 逻辑删除
      *
      * @param ids
      * @return
      */
     public Boolean deleteRecords(Long[] ids) {
         //删除已有映射关系
-        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
-        introduceMapQueryWrapper.in("introduce_id", ids);
-        introduceMapFacade.remove(introduceMapQueryWrapper);
+        UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
+        introduceMapUpdateWrapper.in("introduce_id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceMapFacade.update(new IntroduceMap(), introduceMapUpdateWrapper);
         //删除明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
-        introduceDetailQueryWrapper.in("introduce_id", ids);
-        introduceDetailFacade.remove(introduceDetailQueryWrapper);
+        UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
+        introduceDetailUpdateWrapper.in("introduce_id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        introduceDetailFacade.update(new IntroduceDetail(), introduceDetailUpdateWrapper);
         //删除提示信息
-        this.removeByIds(Arrays.asList(ids));
+        UpdateWrapper<IntroduceInfo> introduceInfoUpdateWrapper = new UpdateWrapper<>();
+        introduceInfoUpdateWrapper.in("id", ids).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new IntroduceInfo(), introduceInfoUpdateWrapper);
         return true;
     }
 

icssman-service/src/main/java/com/diagbot/facade/IntroduceMapFacade.java

@@ -8,13 +8,12 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.IntroduceMapServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroduceMapVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -50,8 +49,11 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
             introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     eq("question_id", introduceMapVO.getQuestionId()).
-                    eq("type", introduceMapVO.getType());
-            this.remove(introduceMapUpdateWrapper);
+                    eq("type", introduceMapVO.getType()).
+                    set("is_deleted", IsDeleteEnum.Y.getKey()).
+                    set("modifier", UserUtils.getCurrentPrincipleID()).
+                    set("gmt_modified", DateUtil.now());
+            this.update(new IntroduceMap(), introduceMapUpdateWrapper);
 
             //插入新的关系
             introduceMap = new IntroduceMap();
@@ -59,10 +61,10 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             introduceMap.setIntroduceId(introduceMapVO.getIntroduceId());
             introduceMap.setType(introduceMapVO.getType());
             introduceMap.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceMap.setGmtCreate(new Date());
+            introduceMap.setGmtCreate(DateUtil.now());
         } else {
             //已有关系更新时间
-            introduceMap.setGmtModified(new Date());
+            introduceMap.setGmtModified(DateUtil.now());
             introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
         }
         this.saveOrUpdate(introduceMap);
@@ -78,10 +80,13 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
     public Boolean delIntroduceMap(IntroduceMapVO introduceMapVO) {
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                eq("introduce_id", introduceMapVO.getIntroduceId()).
                 eq("question_id", introduceMapVO.getQuestionId()).
                 eq("type", introduceMapVO.getType()).
-                set("is_deleted", IsDeleteEnum.Y.getKey());
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
         this.update(new IntroduceMap(), introduceMapUpdateWrapper);
         return true;
     }
-}
+}

icssman-service/src/main/java/com/diagbot/facade/QuestionInfoFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionIndexDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -78,4 +79,17 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         paramMap.put("type", questionIndexDTO.getType());
         return this.index(paramMap);
     }
+
+    /**
+     * 根据标签名获取标签信息
+     * @param questionInfo
+     * @return
+     */
+    public QuestionInfo getQuestionInfos(QuestionInfo questionInfo){
+        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<QuestionInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("type", 1);
+        queryWrapper.eq("name",questionInfo.getName());
+        return this.getOne(queryWrapper);
+    }
 }

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -45,16 +45,16 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
                     "获取科室信息失败");
         }
         questionInfo.setName(questionUsualVO.getQuestionName());
-        RespDTO<QuestionInfo> questionInfoRespDTO = icssServiceClient.getQuestionInfos(questionInfo);
-        if (questionInfoRespDTO == null || !"0".equals(questionInfoRespDTO.code)) {
+        QuestionInfo questionInfoRespDTO = questionInfoFacade.getQuestionInfos(questionInfo);
+        if (questionInfoRespDTO == null) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取标签信息失败");
         }
         QuestionUsual questionUsual = new QuestionUsual();
         questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
         questionUsual.setGmtCreate(DateUtil.now());
-        questionUsual.setQuestionId(questionInfoRespDTO.data.getId());
-        questionUsual.setDeptId(listRespDTO.data.get(0).getId());
+        questionUsual.setQuestionId(questionInfoRespDTO.getId());
+        questionUsual.setDeptId(listRespDTO.get(0).getId());
         Boolean flag = this.save(questionUsual);
         if(!flag){
             throw new CommonException(CommonErrorCode.FAIL,

icssman-service/src/main/java/com/diagbot/facade/VitalOrderFacade.java

@@ -1,20 +1,20 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.VitalInfoDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
-import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,8 +33,12 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     public Boolean saveAll(List<VitalOrderVO> vitalOrderVOList) {
         //先删除现有排序
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         //插入新排序
         List<VitalOrder> vitalOrderList = Lists.newArrayList();
         for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
@@ -42,7 +46,7 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
             vitalOrder.setQuestionId(vitalOrderVO.getVitalId());
             vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
             vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
-            vitalOrder.setGmtCreate(new Date());
+            vitalOrder.setGmtCreate(DateUtil.now());
             vitalOrderList.add(vitalOrder);
         }
         vitalOrderServiceImpl.saveBatch(vitalOrderList);
@@ -81,9 +85,13 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
      * @return
      */
     public Boolean deleteVitalOrder(Long vitalId) {
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.eq("vital_id", vitalId);
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.eq("vital_id", vitalId).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         return true;
     }
 
@@ -94,9 +102,13 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
      * @return
      */
     public Boolean deleteVitalOrders(Long[] vitalIds) {
-        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-        vitalOrderQueryWrapper.in("vital_id", vitalIds);
-        this.remove(vitalOrderQueryWrapper);
+        UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
+        vitalOrderUpdateWrapper.in("vital_id", vitalIds).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                set("is_deleted", IsDeleteEnum.Y.getKey()).
+                set("modifier", UserUtils.getCurrentPrincipleID()).
+                set("gmt_modified", DateUtil.now());
+        this.update(new VitalOrder(), vitalOrderUpdateWrapper);
         return true;
     }
-}
+}

icssman-service/src/main/java/com/diagbot/mapper/DeptInfoMapper.java

@@ -2,9 +2,12 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.vo.GetDeptInfoVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室信息表 Mapper 接口
@@ -16,9 +19,17 @@ import com.diagbot.vo.GetDeptInfoVO;
 public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
 
     /**
-     * 获取科室信息
+     * 分页获取科室信息
      * @param getDeptInfoVO
      * @return
      */
     public IPage<DeptInfo> getAllDeptInfo(GetDeptInfoVO getDeptInfoVO);
+
+    /**
+     *  获取科室信息和
+     * @param deptCode
+     * @param hospitalCode
+     * @return
+     */
+    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode);
 }

icssman-service/src/main/java/com/diagbot/mapper/QuestionInfoMapper.java

@@ -19,4 +19,6 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
     public void deleteByIds(Map map);
 
     public List<QuestionInfo> index(Map map);
+
+
 }

icssman-service/src/main/java/com/diagbot/service/impl/DeptInfoServiceImpl.java

@@ -2,12 +2,15 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.mapper.DeptInfoMapper;
 import com.diagbot.service.DeptInfoService;
 import com.diagbot.vo.GetDeptInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室信息表 服务实现类
@@ -23,4 +26,9 @@ public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> i
     public IPage<DeptInfo> getAllDeptInfo(GetDeptInfoVO getDeptInfoVO) {
         return baseMapper.getAllDeptInfo(getDeptInfoVO);
     }
+
+    @Override
+    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode) {
+        return baseMapper.getDeptInfos(deptCode,hospitalCode);
+    }
 }

icssman-service/src/main/java/com/diagbot/web/IntroduceDetailController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -48,7 +47,7 @@ public class IntroduceDetailController {
     @SysLogger("deleteRecord")
     @Transactional
     public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
-        Boolean data = introduceDetailFacade.removeById(id);
+        Boolean data = introduceDetailFacade.deleteRecord(id);
         return RespDTO.onSuc(data);
     }
 
@@ -58,7 +57,7 @@ public class IntroduceDetailController {
     @SysLogger("deleteRecords")
     @Transactional
     public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
-        Boolean data = introduceDetailFacade.removeByIds(Arrays.asList(ids));
+        Boolean data = introduceDetailFacade.deleteRecords(ids);
         return RespDTO.onSuc(data);
     }
 }

icssman-service/src/main/resources/mapper/DeptInfoMapper.xml

@@ -21,4 +21,11 @@
          </if>
         order by id desc
     </select>
+
+    <select id="getDeptInfos" resultType="com.diagbot.dto.DeptInfoDTO">
+        SELECT a.* FROM `icss_dept_info` a
+        LEFT JOIN tran_hospital_dept b ON a.id = b.dept_id
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
+        AND b.`code` = #{deptCode} AND b.hospital_code = #{hospitalCode}
+    </select>
 </mapper>