删除icss下无效lismapping相关类

icss-service/src/main/java/com/diagbot/entity/LisMapping.java

@@ -1,146 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-/**
- * <p>
- * 化验项目公表映射
- * </p>
- *
- * @author zhaops
- * @since 2018-12-27
- */
-@TableName("icss_lis_mapping")
-public class LisMapping implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 套餐名
-     */
-    private String mealName;
-
-    /**
-     * 项目名
-     */
-    private String itemName;
-
-    /**
-     * 公表名
-     */
-    private String uniqueName;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getMealName() {
-        return mealName;
-    }
-
-    public void setMealName(String mealName) {
-        this.mealName = mealName;
-    }
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-    public String getUniqueName() {
-        return uniqueName;
-    }
-
-    public void setUniqueName(String uniqueName) {
-        this.uniqueName = uniqueName;
-    }
-
-    @Override
-    public String toString() {
-        return "LisMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", mealName=" + mealName +
-        ", itemName=" + itemName +
-        ", uniqueName=" + uniqueName +
-        "}";
-    }
-}

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

@@ -22,9 +22,6 @@ import java.util.stream.Collectors;
  */
 @Component
 public class AssembleFacade {
-    @Autowired
-    private LisMappingFacade lisMappingFacade;
-
     /**
      * 拼装数据
      *
@@ -66,25 +63,6 @@ public class AssembleFacade {
         //化验项映射,转公表
         if (ListUtil.isNotEmpty(pushVO.getLis())) {
             searchData.setLisArr(pushVO.getLis());
-           /* List<String> mealNameList = pushVO.getLis().stream().map(lisResult -> lisResult.getName()).collect(Collectors.toList());
-            Map<String, Map<String, String>> lisConfigMap = lisMappingFacade.getLisMappingByMealName(mealNameList);
-            for (LisResult lisResult : pushVO.getLis()) {
-                //source=0 icss页面数据，source=1 外部导入数据，外部导入数据不处理
-                if (!lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
-                    continue;
-                }
-                if (StringUtil.isNotBlank(lisResult.getName())) {
-                    if (lisResult.getDetailName() == null) {
-                        lisResult.setDetailName("");
-                    }
-                    Map<String, String> detailMap = lisConfigMap.get(lisResult.getName());
-                    if (null != detailMap && detailMap.size() > 0 && StringUtil.isNotBlank(detailMap.get(lisResult.getDetailName()))) {
-                        lisResult.setUniqueName(detailMap.get(lisResult.getDetailName()));
-                    }
-                }
-            }
-            List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
-            searchData.setLisArr(lisResultList);*/
         }
         return searchData;
     }

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

@@ -1,105 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.LisMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.LisMappingServiceImpl;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.google.common.collect.Lists;
-import org.springframework.stereotype.Component;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/27 15:13
- */
-@Component
-public class LisMappingFacade extends LisMappingServiceImpl {
-
-    /**
-     * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>> itemName 不为空
-     * @param mealNameList
-     * @return
-     */
-    public Map<String, Map<String, String>> getLisMappingByMealName(List<String> mealNameList) {
-        Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
-        QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
-        lisMappingQueryWrapper.select("meal_name,ifnull(item_name,'') as item_name,unique_name").eq("is_deleted", IsDeleteEnum.N.getKey());
-        if (ListUtil.isNotEmpty(mealNameList)) {
-            lisMappingQueryWrapper.in("meal_name", mealNameList);
-        }
-        List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
-        Map<String, List<LisMapping>> lisMappingMap = EntityUtil.makeEntityListMap(lisMappingList, "mealName");
-        for (Map.Entry<String, List<LisMapping>> entry : lisMappingMap.entrySet()) {
-            if (entry.getValue().size() > 0) {
-                retMap.put(entry.getKey(), EntityUtil.makeMapWithKeyValue(entry.getValue(), "itemName", "uniqueName"));
-            } else {
-                retMap.put(entry.getKey(), null);
-            }
-        }
-        return retMap;
-    }
-
-    /**
-     * 化验公表映射关系  Map<uniqueName,List<mealName>>
-     * @param uniqueNameList
-     * @return
-     */
-    public Map<String, List<String>> getLisMappingByUniqueName(List<String> uniqueNameList) {
-        Map<String, List<String>> retMap = new LinkedHashMap<>();
-        QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
-        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        if (ListUtil.isNotEmpty(uniqueNameList)) {
-            lisMappingQueryWrapper.in("unique_name", uniqueNameList);
-        }
-        List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
-        Map<String, List<LisMapping>> lisMappingMap = EntityUtil.makeEntityListMap(lisMappingList, "uniqueName");
-        for (Map.Entry<String, List<LisMapping>> entry : lisMappingMap.entrySet()) {
-            retMap.put(entry.getKey(), EntityUtil.makeListByFieldName(entry.getValue(), "mealName"));
-        }
-        return retMap;
-    }
-
-
-    /**
-     * @param project 化验大项
-     * @param details 化验小项
-     * @return
-     */
-    public Map<String, Map<String, String>> getLisMappingByQuestion(String project, List<String> details) {
-        if (StringUtil.isBlank(project)) {
-            return null;
-        }
-
-        List<String> mealNameList = Lists.newLinkedList();
-        mealNameList.add(project);
-        Map<String, Map<String, String>> lisMappingMap = getLisMappingByMealName(mealNameList);
-
-        Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
-        if (lisMappingMap != null && lisMappingMap.get(project) != null) {
-            Map<String, String> projectMap = new LinkedHashMap<>();
-            projectMap.put(project, lisMappingMap.get(project).get(""));
-            retMap.put("project", projectMap);
-        }
-
-        if (ListUtil.isEmpty(details)) {
-            return retMap;
-        }
-
-        Map<String, String> detailMap = new LinkedHashMap<>();
-        Map<String, String> projectDetailMap = lisMappingMap.get(project);
-        if (projectDetailMap != null) {
-            for (String detail : details) {
-                detailMap.put(detail, projectDetailMap.get(detail));
-            }
-        }
-        retMap.put("details", detailMap);
-        return retMap;
-    }
-}

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

@@ -58,8 +58,6 @@ public class PushFacade {
     @Autowired
     private TreatmentFacade treatmentFacade;
     @Autowired
-    private LisMappingFacade lisMappingFacade;
-    @Autowired
     private AiptServiceClient aiptServiceClient;
     @Autowired
     private AssembleFacade assembleFacade;

icss-service/src/main/java/com/diagbot/mapper/LisMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.LisMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 化验项目公表映射 Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2018-12-27
- */
-public interface LisMappingMapper extends BaseMapper<LisMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/LisMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.LisMapping;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 化验项目公表映射 服务类
- * </p>
- *
- * @author zhaops
- * @since 2018-12-27
- */
-public interface LisMappingService extends IService<LisMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/LisMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.LisMapping;
-import com.diagbot.mapper.LisMappingMapper;
-import com.diagbot.service.LisMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 化验项目公表映射 服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2018-12-27
- */
-@Service
-public class LisMappingServiceImpl extends ServiceImpl<LisMappingMapper, LisMapping> implements LisMappingService {
-
-}

icss-service/src/main/resources/mapper/LisMappingMapper.xml

@@ -1,18 +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.LisMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.LisMapping">
-        <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="meal_name" property="mealName" />
-        <result column="item_name" property="itemName" />
-        <result column="unique_name" property="uniqueName" />
-    </resultMap>
-
-</mapper>