Browse Source

icssman删除无用代码

gaodm 6 years ago
parent
commit
7bc050cec1

+ 0 - 191
icssman-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java

@@ -1,191 +0,0 @@
-package com.diagbot.facade;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-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.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.EvaluationModuleAllDTO;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.EvaluationModuleMappingService;
-import com.diagbot.service.impl.EvaluationModuleMappingServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.EvaluationModuleDiseaseIdVO;
-import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
-import com.diagbot.vo.EvaluationModuleListVO;
-import com.diagbot.vo.EvaluationModuleVO;
-
-/**
- * 
- * @author wangfeng
- * 
- * @Description: TODO
- * @date 2019年3月25日 下午4:19:09
- */
-@Component
-public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServiceImpl {
-
-	@Autowired
-	UserServiceClient userServiceClient;
-	@Autowired
-	@Qualifier("evaluationModuleMappingServiceImpl")
-	EvaluationModuleMappingService evaluationModuleMappingService;
-
-	/**
-	 * 分页模糊查询标签组维护接口
-	 *
-	 * @param evaluationModuleDiseaseNameVO
-	 * @return
-	 */
-	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePage(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
-		IPage<EvaluationModuleMappingDTO> datas
-				= evaluationModuleMappingService.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
-		List<EvaluationModuleMappingDTO> data = datas.getRecords();
-		List<String> modifierid
-				= data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		Map<String, String> userNames = new HashMap<>();
-		if (ListUtil.isNotEmpty(modifierid)) {
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-			if (RespDTOUtil.respIsNG(userNamesDTO)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-			}
-			userNames = userNamesDTO.data;
-		}
-		List<EvaluationModuleMappingDTO> evaluationLists = new ArrayList<EvaluationModuleMappingDTO>();
-		for (EvaluationModuleMappingDTO evalua : data) {
-			EvaluationModuleMappingDTO dateNew = new EvaluationModuleMappingDTO();
-			BeanUtil.copyProperties(evalua,dateNew);
-			dateNew.setModifier(userNames.get(evalua.getModifier()));
-			evaluationLists.add(dateNew);
-		}
-
-		return datas.setRecords(evaluationLists);
-	}
-
-	/**
-	 * 
-	 * @param evaluationModuleDiseaseIdVO
-	 * @return
-	 */
-	public List<EvaluationModuleAllDTO> getEvaluationModuleList(EvaluationModuleDiseaseIdVO evaluationModuleDiseaseIdVO) {
-		QueryWrapper<EvaluationModuleMapping> evaluationModuleQuery = new QueryWrapper<>();
-		evaluationModuleQuery.eq("disease_id", evaluationModuleDiseaseIdVO.getDiseaseId()).eq("is_deleted",
-				IsDeleteEnum.N.getKey());
-		List<EvaluationModuleMapping> datas = list(evaluationModuleQuery);
-		// 过滤
-		List<EvaluationModuleAllDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleAllDTO.class);
-		return data;
-	}
-
-	/**
-	 * 
-	 * @param evaluationModuleListVO
-	 * @return
-	 */
-	public boolean updateEvaluationModuleList(EvaluationModuleListVO evaluationModuleListVO) {
-		boolean res = false;
-		if (evaluationModuleListVO != null && ListUtil.isNotEmpty(evaluationModuleListVO.getEvaluationModuleData())) {
-		EvaluationModuleDiseaseIdVO evaluationModuleDiseaseIdVO = new EvaluationModuleDiseaseIdVO();
-		evaluationModuleDiseaseIdVO.setDiseaseId(evaluationModuleListVO.getDiseaseId());
-		res = cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
-		List<EvaluationModuleMapping> evaluationModuleLsit = new ArrayList<EvaluationModuleMapping>();
-		List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
-		for (EvaluationModuleVO dataNew : data) {
-			EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-			BeanUtil.copyProperties(dataNew,evaMou);
-			evaMou.setGmtCreate(DateUtil.now());
-			evaMou.setGmtModified(DateUtil.now());
-			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
-			evaMou.setModifier(UserUtils.getCurrentPrincipleID());
-			evaMou.setOrderNo(dataNew.getOrderNo());
-			evaluationModuleLsit.add(evaMou);
-		}
-
-		res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
-		}
-		return res;
-	}
-
-	/**
-	 * 
-	 * @param evaluationModuleListVO
-	 * @return
-	 */
-	public boolean saveEvaluationModuleList(EvaluationModuleListVO evaluationModuleListVO) {
-		boolean res = false;
-		if (evaluationModuleListVO != null && ListUtil.isNotEmpty(evaluationModuleListVO.getEvaluationModuleData())) {
-			List<EvaluationModuleVO> evaluationData = evaluationModuleListVO.getEvaluationModuleData();
-			List<String> regionName = new ArrayList<>();
-			for (EvaluationModuleVO e : evaluationData) {
-				regionName.add(e.getRegionName());
-			}
-
-			QueryWrapper<EvaluationModuleMapping> evaluationQuery = new QueryWrapper<>();
-
-			evaluationQuery.in("region_name", regionName).eq("is_deleted", IsDeleteEnum.N.getKey());
-			List<EvaluationModuleMapping> dataUnique = list(evaluationQuery);
-			if (dataUnique != null && dataUnique.size() > 0) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-						"该'" + dataUnique.get(0).getRegionName() + "'已存在");
-			}
-			List<EvaluationModuleMapping> evaluationModuleLsit = new ArrayList<EvaluationModuleMapping>();
-			List<EvaluationModuleVO> data = evaluationModuleListVO.getEvaluationModuleData();
-			for (EvaluationModuleVO dataNew : data) {
-				EvaluationModuleMapping evaMou = new EvaluationModuleMapping();
-				BeanUtil.copyProperties(dataNew,evaMou);
-				evaMou.setGmtCreate(DateUtil.now());
-				evaMou.setGmtModified(DateUtil.now());
-				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
-				evaMou.setModifier(UserUtils.getCurrentPrincipleID());
-				evaluationModuleLsit.add(evaMou);
-			}
-			res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
-		}
-		return res;
-	}
-
-	/**
-	 * 
-	 * @param evaluationModuleDiseaseIdVO
-	 * @return
-	 */
-	public boolean cancelEvaluationModuleAll(EvaluationModuleDiseaseIdVO evaluationModuleDiseaseIdVO) {
-		UpdateWrapper<EvaluationModuleMapping> evaluaNew = new UpdateWrapper<>();
-		evaluaNew.eq("disease_id", evaluationModuleDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now());
-		return update(new EvaluationModuleMapping(), evaluaNew);
-	}
-
-	/**
-	 * 
-	 * @param diseaseNameVO
-	 * @return
-	 */
-	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
-
-		return evaluationModuleMappingService.queryEvaluationDiseaseName(diseaseNameVO);
-	}
-
-}

+ 0 - 181
icssman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -1,181 +0,0 @@
-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.client.UserServiceClient;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.IndexConfigAllDTO;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.IndexConfigService;
-import com.diagbot.service.impl.IndexConfigServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.IndexConfigDiseaseIdVO;
-import com.diagbot.vo.IndexConfigDiseaseNameVO;
-import com.diagbot.vo.IndexConfigListVO;
-import com.diagbot.vo.IndexConfigVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月25日 下午4:20:09
- */
-@Component
-public class IndexConfigFacade extends IndexConfigServiceImpl {
-
-	@Autowired
-	@Qualifier("indexConfigServiceImpl")
-	IndexConfigService indexConfigService;
-	@Autowired
-	UserServiceClient userServiceClient;
-	/**
-	 *
-	 * @param indexConfigDiseaseNameVO
-	 * @return
-	 */
-	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
-		IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
-		List<IndexConfigDTO> data = datas.getRecords();
-		List<String> modifierid
-				= data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		Map<String, String> userNames = new HashMap<>();
-		if (ListUtil.isNotEmpty(modifierid)) {
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-			if (RespDTOUtil.respIsNG(userNamesDTO)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-			}
-			userNames = userNamesDTO.data;
-		}
-
-		for (IndexConfigDTO evalua : data) {
-			evalua.setModifier(userNames.get(evalua.getModifier()));
-		}
-		return datas;
-	}
-	/**
-	 * 
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
-		IndexConfigQuery.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
-		List<IndexConfig> datas = list(IndexConfigQuery);
-        //过滤
-        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
-		return data;
-	}
-	/**
-	 * 
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
-			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
-			res = cancelIndexConfigAlls(indexConfigDiseaseIdVO);
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew,IndexConfig);
-				IndexConfig.setGmtCreate(DateUtil.now());
-				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfigLsit.add(IndexConfig);
-			}
-
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-
-		}
-
-		return res;
-	}
-	
-	/**
-	 * 
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null
-				&& ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
-			List<String> indexUnique = new ArrayList<>();
-			for (IndexConfigVO e : indexConfigData) {
-				indexUnique.add(e.getIndexUnique());
-			}
-
-			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
-
-			IndexConfigQuery.eq("disease_id",indexConfigListVO.getDiseaseId())
-					.eq("is_deleted",IsDeleteEnum.N.getKey())
-					.in("index_unique", indexUnique);
-			List<IndexConfig> dataUnique = list(IndexConfigQuery);
-			if (ListUtil.isNotEmpty(dataUnique)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-						"该'" + dataUnique.get(0).getIndexUnique() + "'已存在");
-			}
-
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew,IndexConfig);
-				IndexConfig.setGmtCreate(DateUtil.now());
-				IndexConfig.setGmtModified(DateUtil.now());
-				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
-				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
-				IndexConfigLsit.add(IndexConfig);
-			}
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-		}
-
-		return res;
-	}
-	
-	/**
-	 * 
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		
-		UpdateWrapper<IndexConfig> IndexConfigNew =new UpdateWrapper<>();
-		IndexConfigNew.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-		.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-	    .set("gmt_modified", DateUtil.now());
-		return update(new IndexConfig(), IndexConfigNew);
-	}
-	/**
-	 * 
-	 * @param diseaseNameVO
-	 * @return
-	 */
-	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
-		return indexConfigService.queryIndexConfigDiseaseName(diseaseNameVO);
-	}
-}

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

@@ -1,190 +0,0 @@
-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.client.UserServiceClient;
-import com.diagbot.dto.GetDeptInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DeptInfo;
-import com.diagbot.entity.QuestionUsual;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.QuestionUsualService;
-import com.diagbot.service.impl.QuestionUsualServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DeleteQuestionUsualVO;
-import com.diagbot.vo.GetDeptInfoVO;
-import com.diagbot.vo.GetQuestionIdsByTypeVO;
-import com.diagbot.vo.QuestionUsualVO;
-import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/3 17:06
- */
-@Component
-public class QuestionUsualFacade extends QuestionUsualServiceImpl {
-    @Autowired
-    private DeptInfoFacade deptInfoFacade;
-    @Autowired
-    private UserServiceClient userServiceClient;
-    @Autowired
-    @Qualifier("questionUsualServiceImpl")
-    private QuestionUsualService questionUsualService;
-    @Autowired
-    private QuestionFacade questionFacade;
-
-    /**
-     * 添加常用标签
-     *
-     * @param questionUsualVO
-     * @return
-     */
-    public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
-        //判断科室是否已被删除
-        if(deptIsDeletedStatus(questionUsualVO.getDeptId())){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "科室已删除");
-        }
-        List<QuestionUsual> addList = Lists.newArrayList();
-        //判断该科室是否添加过常用标签
-        QuestionUsual questionUsual = new QuestionUsual();
-        String userId = UserUtils.getCurrentPrincipleID();
-        Date now = DateUtil.now();
-        List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
-        List<Long> questionIdList = questionUsualList.stream().map(questionUsual1 -> questionUsual1.getQuestionId()).collect(Collectors.toList());
-        //如果添加过将原来的标签删除
-        if (ListUtil.isNotEmpty(questionUsualList)) {
-            UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper();
-            updateWrapper.eq("dept_id", questionUsualVO.getDeptId())
-                    .in("question_id",questionIdList)
-                    .set("is_deleted", IsDeleteEnum.Y.getKey())
-                    .set("modifier", userId)
-                    .set("gmt_modified", now);
-            this.update(new QuestionUsual(), updateWrapper);
-        }
-        //重新添加标签
-        for (int i = 0; i < questionUsualVO.getQuestionId().size(); i++) {
-            questionUsual = new QuestionUsual();
-            questionUsual.setCreator(userId);
-            questionUsual.setModifier(userId);
-            questionUsual.setGmtCreate(now);
-            questionUsual.setGmtModified(now );
-            questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
-            questionUsual.setDeptId(questionUsualVO.getDeptId());
-            questionUsual.setOrderNo(Long.parseLong(String.valueOf(i + 1)));
-            addList.add(questionUsual);
-        }
-        Boolean flag = questionUsualService.saveBatch(addList);
-        if (!flag) {
-            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED,
-                    "常用症状添加失败");
-        }
-        return true;
-    }
-
-    /**
-     * 删除常用标签
-     *
-     * @param deleteQuestionUsualVO
-     * @return
-     */
-    public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO) {
-        //判断科室是否已被删除
-        if(deptIsDeletedStatus(deleteQuestionUsualVO.getDeptId())){
-            throw new CommonException(CommonErrorCode.NOT_EXISTS,
-                    "科室已删除");
-        }
-        //查询常用标签是否已被删除
-        QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId());
-        List<QuestionUsual> questionUsualList = this.list(queryWrapper);
-        List<Long> questionIds = new ArrayList<>();
-        Boolean flag = false;
-        questionUsualList.stream().forEach(questionUsual -> questionIds.add(questionUsual.getQuestionId()));
-        for (QuestionUsual questionUsual:questionUsualList) {
-            if(questionUsual.getIsDeleted().equals(IsDeleteEnum.N.getKey())){
-                flag = true;
-                break;
-            }
-        }
-        if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
-                    "标签已删除");
-        }
-        //查询出相关类型的标签id
-        GetQuestionIdsByTypeVO getQuestionIdsByTypeVO = new GetQuestionIdsByTypeVO();
-        getQuestionIdsByTypeVO.setQuestionIds(questionIds);
-        getQuestionIdsByTypeVO.setQuestionType(deleteQuestionUsualVO.getType());
-        List<Long> questionInfoList = questionFacade.getQuestionIdsByType(getQuestionIdsByTypeVO);
-        //如果存在相关类型的数据,就删除
-        if(ListUtil.isNotEmpty(questionInfoList)){
-            //删除常用标签
-            String userId = UserUtils.getCurrentPrincipleID();
-            UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
-                    .in("question_id",questionInfoList)
-                    .set("is_deleted", IsDeleteEnum.Y.getKey())
-                    .set("modifier", userId)
-                    .set("gmt_modified", DateUtil.now());
-            this.update(new QuestionUsual(), updateWrapper);
-        }
-        return true;
-    }
-
-    /**
-     * 获取科室信息
-     *
-     * @param getDeptInfoVO
-     * @return
-     */
-    public IPage<GetDeptInfoDTO> getDeptInfos(GetDeptInfoVO getDeptInfoVO) {
-        //分页查询科室
-        IPage<GetDeptInfoDTO> iPage = deptInfoFacade.getAllDeptInfo(getDeptInfoVO);
-        //获取用户信息
-        List<String> ids = new ArrayList<>();
-        for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
-            ids.add(getDeptInfoDTO.getModifier());
-        }
-        if(ListUtil.isNotEmpty(ids)){
-            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-            if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR,
-                        "获取用户信息失败");
-            }
-            //将用户信息放入实体
-            for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
-                getDeptInfoDTO.setUserName(respDTO.data.get(getDeptInfoDTO.getModifier()));
-                getDeptInfoDTO.setTypeName(QuestionTypeEnum.getName(getDeptInfoDTO.getType()));
-            }
-        }
-        return iPage;
-    }
-
-    /**
-     * 判断科室是否已删除
-     * @param deptId
-     * @return
-     */
-    public Boolean deptIsDeletedStatus(Long deptId){
-        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
-        queryWrapper.eq("id",deptId);
-        return deptInfoFacade.count(queryWrapper) > 0 ? true : false;
-    }
-}

+ 0 - 30
icssman-service/src/main/java/com/diagbot/mapper/EvaluationModuleMappingMapper.java

@@ -1,30 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * <p>
- * 管理与评估模板表 Mapper 接口
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-public interface EvaluationModuleMappingMapper extends BaseMapper<EvaluationModuleMapping> {
-
-    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(@Param("evaluationModule") EvaluationModuleDiseaseNameVO evaluationModule);
-
-	List<DiseaseInfoDTO> queryEvaluationDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
-
-}

+ 0 - 31
icssman-service/src/main/java/com/diagbot/mapper/IndexConfigMapper.java

@@ -1,31 +0,0 @@
-package com.diagbot.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.IndexConfigDiseaseNameVO;
-
-/**
- * <p>
- * 指标配置 Mapper 接口
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-public interface IndexConfigMapper extends BaseMapper<IndexConfig> {
-
-	IPage<IndexConfigDTO> queryIndexConfigPageAlls(@Param("indexConfigVO")IndexConfigDiseaseNameVO indexConfigVO);
-
-	List<DiseaseInfoDTO> queryIndexConfigDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
-
-
-}

+ 0 - 38
icssman-service/src/main/java/com/diagbot/mapper/QuestionUsualMapper.java

@@ -1,38 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
-import com.diagbot.entity.QuestionUsual;
-import com.diagbot.entity.wrapper.QuestionUsualWapper;
-import com.diagbot.entity.wrapper.QuestionWrapper;
-import com.diagbot.vo.GetQuestionIdsByTypeVO;
-import com.diagbot.vo.GetQuestionUsualAndTypeVO;
-import com.diagbot.vo.QuestionUsualVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 常用标签表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface QuestionUsualMapper extends BaseMapper<QuestionUsual> {
-    /**
-     *
-     * 根据标签id获取常用标签信息
-     * @param questionUsualVO
-     * @return
-     */
-    public List<QuestionUsual> getQuestionUsualByQuestionId(@Param("questionUsualVO") QuestionUsualVO questionUsualVO);
-
-    /**
-     * 根据科室id获取常用标签
-     *
-     * @return
-     */
-    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO GetQuestionUsualAndTypeVO);
-}

+ 0 - 27
icssman-service/src/main/java/com/diagbot/service/EvaluationModuleMappingService.java

@@ -1,27 +0,0 @@
-package com.diagbot.service;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
-
-/**
- * <p>
- * 管理与评估模板表 服务类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-public interface EvaluationModuleMappingService extends IService<EvaluationModuleMapping> {
-
-    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO);
-
-	List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO);
-
-}

+ 0 - 28
icssman-service/src/main/java/com/diagbot/service/IndexConfigService.java

@@ -1,28 +0,0 @@
-package com.diagbot.service;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.IndexConfigDiseaseNameVO;
-
-/**
- * <p>
- * 指标配置 服务类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-public interface IndexConfigService extends IService<IndexConfig> {
-
-	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO);
-
-	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO);
-
-}

+ 0 - 36
icssman-service/src/main/java/com/diagbot/service/QuestionUsualService.java

@@ -1,36 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
-import com.diagbot.entity.QuestionUsual;
-import com.diagbot.vo.GetQuestionUsualAndTypeVO;
-import com.diagbot.vo.QuestionUsualVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 常用标签表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface QuestionUsualService extends IService<QuestionUsual> {
-
-    /**
-     * 根据标签id获取常用标签信息
-     *
-     * @param questionUsualVO
-     * @return
-     */
-    public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO);
-
-    /**
-     * 根据科室id获取常用标签
-     *
-     * @return
-     */
-    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO);
-
-}

+ 0 - 41
icssman-service/src/main/java/com/diagbot/service/impl/EvaluationModuleMappingServiceImpl.java

@@ -1,41 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.EvaluationModuleMappingDTO;
-import com.diagbot.entity.EvaluationModuleMapping;
-import com.diagbot.mapper.EvaluationModuleMappingMapper;
-import com.diagbot.service.EvaluationModuleMappingService;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 管理与评估模板表 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-@Service
-public class EvaluationModuleMappingServiceImpl extends ServiceImpl<EvaluationModuleMappingMapper, EvaluationModuleMapping> implements EvaluationModuleMappingService {
-
-    @Override
-    public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
-        return baseMapper.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
-
-    }
-
-	@Override
-	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
-		return baseMapper.queryEvaluationDiseaseName(diseaseNameVO);
-	}
-
-
-}

+ 0 - 38
icssman-service/src/main/java/com/diagbot/service/impl/IndexConfigServiceImpl.java

@@ -1,38 +0,0 @@
-package com.diagbot.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DiseaseInfoDTO;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.mapper.IndexConfigMapper;
-import com.diagbot.service.IndexConfigService;
-import com.diagbot.vo.DiseaseNameVO;
-import com.diagbot.vo.IndexConfigDiseaseNameVO;
-
-/**
- * <p>
- * 指标配置 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2019-03-25
- */
-@Service
-public class IndexConfigServiceImpl extends ServiceImpl<IndexConfigMapper, IndexConfig> implements IndexConfigService {
-
-	@Override
-	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
-		return baseMapper.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
-	}
-
-	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
-		// TODO Auto-generated method stub
-		return baseMapper.queryIndexConfigDiseaseName(diseaseNameVO);
-	}
-
-}

+ 0 - 34
icssman-service/src/main/java/com/diagbot/service/impl/QuestionUsualServiceImpl.java

@@ -1,34 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
-import com.diagbot.entity.QuestionUsual;
-import com.diagbot.mapper.QuestionUsualMapper;
-import com.diagbot.service.QuestionUsualService;
-import com.diagbot.vo.GetQuestionUsualAndTypeVO;
-import com.diagbot.vo.QuestionUsualVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 常用标签表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@Service
-public class QuestionUsualServiceImpl extends ServiceImpl<QuestionUsualMapper, QuestionUsual> implements QuestionUsualService {
-
-    @Override
-    public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO) {
-        return baseMapper.getQuestionUsualByQuestionId(questionUsualVO);
-    }
-
-    @Override
-    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
-        return baseMapper.getQuestionUsualByDeptIds(getQuestionUsualAndTypeVO);
-    }
-}

+ 0 - 60
icssman-service/src/main/resources/mapper/EvaluationModuleMappingMapper.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.EvaluationModuleMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.EvaluationModuleMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="region_name" property="regionName" />
-        <result column="region_type" property="regionType" />
-        <result column="order_no" property="orderNo" />
-        <result column="disease_id" property="diseaseId" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-<select id="queryEvaluationModulePageAll" resultType="com.diagbot.dto.EvaluationModuleMappingDTO">
-	SELECT
-	a.id as id ,
-	a.gmt_create as gmtCreate,
-	a.gmt_modified as gmtModified,
-	a.creator as creator,
-	a.modifier as modifier,
-	a.region_name as regionName,
-	a.region_type as regionType,
-	a.order_no as orderNo,
-	a.disease_id as diseaseId,
-	b.tag_name as diseaseName
-	FROM
-	icss_evaluation_module_mapping a
-	JOIN icss_question_info b
-	WHERE a.is_deleted = 'N'and a.disease_id = b.id
-	<if test="evaluationModule.diseaseName != null">
-	AND b.tag_name LIKE CONCAT('%', #{evaluationModule.diseaseName}, '%')
-	</if>
-	GROUP BY a.disease_id
-	ORDER BY a.gmt_create DESC
-</select>
-<select id="queryEvaluationDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
-	SELECT
-	a.dis_id AS diseaseId,
-	b.tag_name AS diseaseName
-	FROM
-	icss_dis_type a
-	LEFT JOIN icss_evaluation_module_mapping c
-	ON a.dis_id = c.disease_id
-	JOIN icss_question_info b
-	ON a.dis_id = b.id
-	WHERE c.disease_id IS NULL
-	AND a.is_deleted = "N"
-	<if test="diseaseNameVO.diseaseName != null">
-	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
-	</if>
-	ORDER BY b.tag_name DESC
-</select>
-
-</mapper>

+ 0 - 58
icssman-service/src/main/resources/mapper/IndexConfigMapper.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.IndexConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.IndexConfig">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="index_unique" property="indexUnique" />
-        <result column="disease_id" property="diseaseId" />
-        <result column="index_desc" property="indexDesc" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-<select id="queryIndexConfigPageAlls" resultType="com.diagbot.dto.IndexConfigDTO">
-	SELECT
-	a.id as id,
-	a.gmt_create as gmtCreate,
-	a.gmt_modified as gmtModified,
-	a.creator as creator,
-	a.modifier as modifier,
-	a.disease_id as diseaseId ,
-	b.tag_name as diseaseName
-	FROM
-	icss_index_config a
-	JOIN icss_question_info b
-	WHERE a.disease_id = b.id
-	AND a.is_deleted = "N"
-	AND b.is_deleted = "N"
-	<if test="indexConfigVO.diseaseName != null and indexConfigVO.diseaseName != ''">
-	AND b.tag_name LIKE CONCAT('%', #{indexConfigVO.diseaseName}, '%')
-	</if>
-	GROUP BY a.disease_id
-	ORDER BY a.gmt_create DESC
-</select>
-<select id="queryIndexConfigDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
-	SELECT DISTINCT
-	a.dis_id AS diseaseId,
-	b.tag_name AS diseaseName
-	FROM
-	icss_dis_type a
-	JOIN icss_question_info b
-	ON a.dis_id = b.id
-	LEFT JOIN icss_index_config f ON a.dis_id = f.disease_id and f.is_deleted = 'N'
-	WHERE a.type = 1
-	AND f.disease_id is null
-	AND a.is_deleted = "N"
-	AND b.is_deleted = "N"
-	<if test="diseaseNameVO.diseaseName != null and diseaseNameVO.diseaseName != ''">
-	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
-	</if>
-	ORDER BY b.tag_name DESC
-</select>
-</mapper>

+ 0 - 37
icssman-service/src/main/resources/mapper/QuestionUsualMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.QuestionUsualMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.QuestionUsual">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="question_id" property="questionId" />
-        <result column="dept_id" property="deptId" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getQuestionUsualByQuestionId" resultType="com.diagbot.entity.QuestionUsual">
-        SELECT a.* FROM `icss_question_usual` a
-        LEFT JOIN icss_question_info b ON a.question_id = b.id
-        WHERE a.is_deleted = 'N' and b.is_deleted = 'N'
-        AND a.dept_id = #{questionUsualVO.deptId} AND b.type = #{questionUsualVO.type}
-    </select>
-
-    <select id="getQuestionUsualByDeptIds" resultType="com.diagbot.dto.GetQuestionUsualAndTypeDTO">
-        SELECT
-	      a.*,b.type
-        FROM
-	      `icss_question_usual` a
-        LEFT JOIN icss_question_info b ON a.question_id = b.id
-        WHERE
-	      a.is_deleted = 'N'
-        AND b.type = #{type}
-        GROUP BY a.dept_id
-    </select>
-</mapper>