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

# Conflicts:
#	icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

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

@@ -0,0 +1,146 @@
+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/LisConfigFacade.java

@@ -1,18 +1,14 @@
 package com.diagbot.facade;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.util.EntityUtil;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.entity.LisConfig;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.LisConfigServiceImpl;
 import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * 
@@ -37,27 +33,4 @@ public class LisConfigFacade extends LisConfigServiceImpl {
 		List<LisConfigDTO> datas = BeanUtil.listCopyTo(data, LisConfigDTO.class);
 		return datas;
 	}
-
-	/**
-	 * 根据医院编码获取化验项映射关系
-	 *
-	 * @param hospitalCode
-	 * @return
-	 */
-	public Map<String, Map<String, String>> getLisConfigMapByHospitalCode(String hospitalCode) {
-		Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
-		QueryWrapper<LisConfig> lisConfigQueryWrapper = new QueryWrapper<>();
-		lisConfigQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-				.eq("hospital_code", hospitalCode);
-		List<LisConfig> lisConfigList = this.list(lisConfigQueryWrapper);
-		Map<String, List<LisConfig>> lisConfigMap = EntityUtil.makeEntityListMap(lisConfigList, "mealName");
-		for (Map.Entry<String, List<LisConfig>> entry : lisConfigMap.entrySet()) {
-			if (entry.getValue().size() > 0) {
-				retMap.put(entry.getKey(), EntityUtil.makeMapWithKeyValue(entry.getValue(), "itemName", "uniqueName"));
-			} else {
-				retMap.put(entry.getKey(), null);
-			}
-		}
-		return retMap;
-	}
 }

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

@@ -0,0 +1,42 @@
+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.impl.LisMappingServiceImpl;
+import com.diagbot.util.EntityUtil;
+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 {
+
+    /**
+     * 获取化验公表映射关系
+     *
+     * @return
+     */
+    public Map<String, Map<String, String>> getLisMapping() {
+        Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
+        QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
+        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        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;
+    }
+}

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

@@ -14,6 +14,7 @@ import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.LisConfig;
+import com.diagbot.entity.LisMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
@@ -68,7 +69,7 @@ public class PushFacade {
     @Autowired
     private HighRiskServiceClient highRiskServiceClient;
     @Autowired
-    private LisConfigFacade lisConfigFacade;
+    private LisMappingFacade lisMappingFacade;
 
     /**
      * 推理接口
@@ -101,7 +102,7 @@ public class PushFacade {
 
         //化验项映射,转公表
         if (pushVO.getLis().size() > 0) {
-            Map<String, Map<String, String>> lisConfigMap = lisConfigFacade.getLisConfigMapByHospitalCode("A000");
+            Map<String, Map<String, String>> lisConfigMap = lisMappingFacade.getLisMapping();
             for (LisResultVO lisResultVO : pushVO.getLis()) {
                 //source=0 icss页面数据，source=1 外部导入数据
                 if (!lisResultVO.getSource().equals(LisSourceEnum.Inner.getKey())) {

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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/impl/LisMappingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl.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

@@ -0,0 +1,18 @@
+<?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>

icssman-service/src/main/java/com/diagbot/dto/ModuleInfoListDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.ModuleInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/27 11:46
+ */
+@Getter
+@Setter
+public class ModuleInfoListDTO extends ModuleInfo {
+    //操作人名称
+    private String userName;
+    //归属名称
+    private String ascriptionName;
+
+}

icssman-service/src/main/java/com/diagbot/entity/ModuleInfo.java

@@ -60,6 +60,16 @@ public class ModuleInfo implements Serializable {
      */
     private String name;
 
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 慢病
+     */
+    private Long disease;
+
     /**
      * 备注
      */

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

@@ -2,8 +2,13 @@ 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.GetQuestionInfoDTO;
 import com.diagbot.dto.ModuleInfoDTO;
+import com.diagbot.dto.ModuleInfoListDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DictionaryInfo;
 import com.diagbot.entity.ModuleDetail;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -41,6 +46,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
     QuestionFacade questionFacade;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    DictionaryFacade dictionaryFacade;
 
     /**
      * 根据id删除标签模板
@@ -173,4 +182,42 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             }
         return moduleInfoDTOList;
     }
+
+    /**
+     * 模板维护页面获取模板列表
+     *
+     * @param getModuleInfoVO
+     * @return
+     */
+    public IPage<ModuleInfoListDTO> getModuleInfoList(GetModuleInfoVO getModuleInfoVO){
+        //获取模板信息
+        IPage<ModuleInfoListDTO> moduleInfoDTOIPage = this.getModuleInfoListByType(getModuleInfoVO);
+        List<String> ids = new ArrayList<>();
+        for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
+            ids.add(moduleInfoListDTO.getModifier());
+        }
+        //获取模板类型名称
+        QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
+        dictionaryInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+            .eq("group_type",4)
+            .eq("return_type",1)
+            .orderByDesc("order_no");
+        List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
+        Map<String,DictionaryInfo> dictionaryInfoMap = new HashMap<>();
+        for (DictionaryInfo dictionaryInfo:dictionaryInfoList) {
+            dictionaryInfoMap.put(dictionaryInfo.getVal(),dictionaryInfo);
+        }
+        //获取用户信息
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+        if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取用户信息失败");
+        }
+        //将用户信息放入实体
+        for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
+            moduleInfoListDTO.setUserName(respDTO.data.get(moduleInfoListDTO.getModifier()));
+            moduleInfoListDTO.setAscriptionName(dictionaryInfoMap.get(String.valueOf(moduleInfoListDTO.getType().intValue())).getName());
+        }
+        return moduleInfoDTOIPage;
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.entity.ModuleInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.GetModuleInfoVO;
 
 import java.util.Map;
 
@@ -16,4 +19,12 @@ import java.util.Map;
 public interface ModuleInfoMapper extends BaseMapper<ModuleInfo> {
 
     public void deleteByIds(Map map);
+
+    /**
+     * 获取模板列表
+     *
+     * @param getModuleInfoVO
+     * @return
+     */
+    public IPage<ModuleInfoListDTO> getModuleInfoListByType(GetModuleInfoVO getModuleInfoVO);
 }

icssman-service/src/main/java/com/diagbot/service/ModuleInfoService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.entity.ModuleInfo;
+import com.diagbot.vo.GetModuleInfoVO;
 
 import java.util.Map;
 
@@ -22,4 +25,12 @@ public interface ModuleInfoService extends IService<ModuleInfo> {
      * @return
      */
     public void deleteByIds(Map map);
+
+    /**
+     * 获取模板列表
+     *
+     * @param getModuleInfoVO
+     * @return
+     */
+    public IPage<ModuleInfoListDTO> getModuleInfoListByType(GetModuleInfoVO getModuleInfoVO);
 }

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

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.mapper.ModuleInfoMapper;
 import com.diagbot.service.ModuleInfoService;
+import com.diagbot.vo.GetModuleInfoVO;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -23,4 +26,9 @@ public class ModuleInfoServiceImpl extends ServiceImpl<ModuleInfoMapper, ModuleI
     public void deleteByIds(Map map) {
         baseMapper.deleteByIds(map);
     }
+
+    @Override
+    public IPage<ModuleInfoListDTO> getModuleInfoListByType(GetModuleInfoVO getModuleInfoVO) {
+        return baseMapper.getModuleInfoListByType(getModuleInfoVO);
+    }
 }

icssman-service/src/main/java/com/diagbot/vo/GetModuleInfoVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,7 +11,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class GetModuleInfoVO {
+public class GetModuleInfoVO extends Page {
     //模板类型
     private Integer type;
 }

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

@@ -1,9 +1,11 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.ModuleInfoDTO;
+import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ModuleInfoFacade;
 import com.diagbot.vo.AddModuleInfoVO;
@@ -96,4 +98,14 @@ public class ModuleInfoController {
         List<ModuleInfoDTO> date = moduleInfoFacade.getModuleInfo(getModuleInfoVO);
         return RespDTO.onSuc(date);
     }
+
+    @ApiOperation(value = "获取模板列表[by:wangyu]",
+            notes = "type: 模板类型,1：主诉模板 2：现病史模板 3：现病史空模板 4 : 其他史模板 5：嵌套模板 6：慢病模板<br>" +
+                    "<br>")
+    @PostMapping("/getModuleInfoList")
+    @SysLogger("getModuleInfoList")
+    public RespDTO<IPage<ModuleInfoListDTO>> getModuleInfoList(@Valid @RequestBody GetModuleInfoVO getModuleInfoVO) {
+        IPage<ModuleInfoListDTO> date = moduleInfoFacade.getModuleInfoList(getModuleInfoVO);
+        return RespDTO.onSuc(date);
+    }
 }

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

@@ -24,4 +24,12 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getModuleInfoListByType" resultType="com.diagbot.dto.ModuleInfoListDTO">
+        SELECT * FROM `icss_module_info` WHERE is_deleted = 'N'
+        <if test="type != null and type != ''">
+            and type = #{type}
+        </if>
+        order by gmt_modified desc
+    </select>
 </mapper>