Merge branch 'dev/mix20190806_version' into develop

# Conflicts:
#	knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
#	knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

aipt-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+   // private String creator;
+
+  
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+  //  private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

aipt-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

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

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_version_detail")
+@TableName("kl_version_detail")
 public class VersionDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -12,10 +12,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * 版本信息(关于)
  * </p>
  *
- * @author wangfeng
- * @since 2018-11-20
+ * @author gaodm
+ * @since 2019-08-07
  */
-@TableName("icss_version_info")
+@TableName("kl_version_info")
 public class VersionInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -48,6 +48,11 @@ public class VersionInfo implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+
     /**
      * 名称
      */
@@ -107,6 +112,13 @@ public class VersionInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
     public String getName() {
         return name;
     }
@@ -145,6 +157,7 @@ public class VersionInfo implements Serializable {
         ", gmtModified=" + gmtModified +
         ", creator=" + creator +
         ", modifier=" + modifier +
+        ", productType=" + productType +
         ", name=" + name +
         ", refreshTime=" + refreshTime +
         ", status=" + status +

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

@@ -1,50 +1,50 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.VersionDetailDTO;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.service.impl.VersionDetailServiceImpl;
-import com.diagbot.util.BeanUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 版本详情
- *
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:38:40
- */
-@Component
-public class VersionDetailFacaed extends VersionDetailServiceImpl {
-
-    /**
-     * 根据版本id查询版本详情
-     *
-     * @param id
-     * @return
-     */
-    public List<VersionDetailDTO> getById(Long id) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-        Map<String, Object> mapAll = new HashMap<>();
-        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
-        mapAll.put("version_id", id);
-        mapAll.put("STATUS", StatusEnum.Enable.getKey());
-        versionDetailQuery.allEq(mapAll).orderByAsc("order_no");
-
-        VersionDetail versionDetail = new VersionDetail();
-        versionDetail.setVersionId(id);
-        List<VersionDetail> datas = list(versionDetailQuery);
-        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        //过滤字段
-        dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);
-        return dataNew;
-
-    }
-}
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 版本详情
+ *
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:38:40
+ */
+@Component
+public class VersionDetailFacade extends VersionDetailServiceImpl {
+
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailDTO> getById(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("version_id", id);
+        mapAll.put("STATUS", StatusEnum.Enable.getKey());
+        versionDetailQuery.allEq(mapAll).orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        //过滤字段
+        dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);
+        return dataNew;
+
+    }
+}

aipt-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -0,0 +1,69 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.IntegerUtil;
+import com.diagbot.vo.VersionVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年11月21日 上午11:07:01
+ */
+@Component
+public class VersionInfoFacade extends VersionInfoServiceImpl {
+
+    @Autowired
+    VersionDetailFacade versionDetailFacade;
+
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionWrapperDTO getVersionInfoAll(VersionVO versionVO) {
+        //入参配置验证
+        if (null == versionVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
+
+        if (IntegerUtil.isNull(versionVO.getProductType())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "产品类型不能为空！");
+        }
+        //查询最新的一条版本信息
+        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("product_type", versionVO.getProductType())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByDesc("gmt_modified");
+
+        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionWrapperDTO versionList = new VersionWrapperDTO();
+
+        if (versionInfo != null) {
+            //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            long id = versionInfo.getId();
+            List<VersionDetailDTO> detail = versionDetailFacade.getById(id);
+            //System.out.println(detail.toString());
+            versionList.setId(versionInfo.getId());
+            versionList.setName(versionInfo.getName());
+            versionList.setRefreshTime(versionInfo.getRefreshTime());
+            versionList.setStatus(versionInfo.getStatus());
+            versionList.setDetail(detail);
+        }
+
+        return versionList;
+    }
+}

aipt-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

aipt-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.facade.VersionInfoFacade;
+import com.diagbot.vo.VersionVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 版本信息(关于) 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@RestController
+@RequestMapping("/versionInfo")
+@Api(value = "版本信息(关于)API[by:wangfeng]", tags = { "WF——版本信息(关于)API" })
+@SuppressWarnings("unchecked")
+public class VersionInfoController {
+
+    @Autowired
+    VersionInfoFacade versionInfoFacade;
+
+    @ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+    @PostMapping("/getVersionInfoAlls")
+    @SysLogger("getVersionInfoAlls")
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(@RequestBody VersionVO versionVO) {
+        VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll(versionVO);
+        return RespDTO.onSuc(data);
+    }
+
+}

aipt-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_concept" }); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_version_info" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

common/pom.xml

@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.56</version>
+            <version>1.2.60</version>
             <scope>compile</scope>
         </dependency>
 

common/src/main/java/com/diagbot/enums/ProductTypeEnum.java

@@ -0,0 +1,52 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 产品类型
+ * @author: gaodm
+ * @time: 2018/9/14 9:15
+ */
+public enum ProductTypeEnum implements KeyedNamed {
+    DIAGBOTCLOUD_INNER(1, "云平台内部"),
+    DIAGBOTCLOUD_OUTER(2, "云平台外部"),
+    ICSS(3, "ICSS"),
+    TRIAGE(4, "智能分诊"),
+    DATA(5, "数据服务模式"),
+    PREC(6, "智能预问诊");
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    ProductTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ProductTypeEnum getEnum(int key) {
+        for (ProductTypeEnum item : ProductTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        ProductTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -8,7 +8,9 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptIntroduceVO;
+import com.diagbot.vo.VersionVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -72,4 +74,10 @@ public interface AiptServiceClient {
      */
     @PostMapping(value = "/conceptDetail/getConceptDetail")
     RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO);
+
+    /**
+     * 获取版本信息
+     */
+    @PostMapping("/versionInfo/getVersionInfoAlls")
+    RespDTO<VersionWrapperDTO> getVersionInfoAlls(@RequestBody VersionVO versionVO);
 }

data-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -1,19 +1,17 @@
 package com.diagbot.client;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
+import com.diagbot.client.hystrix.TranServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.MrVO;
 import com.diagbot.vo.PushJoinVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.diagbot.client.hystrix.TranServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.vo.HospitalSetVO;
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 调用信息对接层服务
@@ -23,17 +21,16 @@ import com.diagbot.vo.HospitalSetVO;
 @FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
 public interface TranServiceClient {
 
-	/**
-	 * 
-	 * @param hospitalSetVO
-	 * @return
-	 */
+    /**
+     * @param hospitalSetVO
+     * @return
+     */
     @PostMapping("/sysSet/getSysSetInfoDatas")
     RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
 
-	@PostMapping("/mr/createMr")
-	RespDTO<String> createMr(@RequestBody PushJoinVO pushJoinVO);
+    @PostMapping("/mr/createMr")
+    RespDTO<String> createMr(@RequestBody PushJoinVO pushJoinVO);
 
-	@PostMapping("/mr/getMr")
-	RespDTO<PushJoinVO> getMr(@RequestBody @Valid MrVO mrVO);
+    @PostMapping("/mr/getMr")
+    RespDTO<PushJoinVO> getMr(@RequestBody @Valid MrVO mrVO);
 }

data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -8,7 +8,9 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptIntroduceVO;
+import com.diagbot.vo.VersionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -90,4 +92,13 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getConceptDetail");
         return null;
     }
+
+    /**
+     * 获取版本信息
+     */
+    @Override
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(VersionVO versionVO) {
+        log.error("【hystrix】调用{}异常", "getVersionInfoAlls");
+        return null;
+    }
 }

data-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -1,22 +1,18 @@
 package com.diagbot.client.hystrix;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import com.diagbot.vo.MrVO;
-import com.diagbot.vo.PushJoinVO;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.HospitalSetVO;
-
+import com.diagbot.vo.MrVO;
+import com.diagbot.vo.PushJoinVO;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm

data-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+   // private String creator;
+
+  
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+  //  private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

data-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

data-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -0,0 +1,34 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.VersionVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年11月21日 上午11:07:01
+ */
+@Component
+public class VersionInfoFacade {
+
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionWrapperDTO getVersionInfoAll() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.DATA.getKey());
+        RespDTO<VersionWrapperDTO> res = aiptServiceClient.getVersionInfoAlls(versionVO);
+        RespDTOUtil.respNGDealCover(res, "获取不到版本信息！");
+        return res.data;
+    }
+}

data-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

data-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.facade.VersionInfoFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 版本信息(关于) 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@RestController
+@RequestMapping("/versionInfo")
+@Api(value = "版本信息(关于)API[by:wangfeng]", tags = { "WF——版本信息(关于)API" })
+@SuppressWarnings("unchecked")
+public class VersionInfoController {
+
+    @Autowired
+    VersionInfoFacade versionInfoFacade;
+
+    @ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+    @PostMapping("/getVersionInfoAlls")
+    @SysLogger("getVersionInfoAlls")
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
+        VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
+        return RespDTO.onSuc(data);
+    }
+
+}

docs/016.20190827全部产品线版本控制/init_med.sql

@@ -0,0 +1,67 @@
+use `med`;
+-- ----------------------------
+-- Table structure for kl_version_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `kl_version_detail`;
+CREATE TABLE `kl_version_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `version_id` bigint(30) DEFAULT NULL COMMENT '版本主表id',
+  `title` varchar(200) DEFAULT NULL COMMENT '标题',
+  `description` text COMMENT '描述',
+  `order_no` varchar(5) DEFAULT NULL COMMENT '排序号',
+  `status` varchar(5) DEFAULT NULL COMMENT '1：启动，0：不启用',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 COMMENT='版本详情(关于)';
+
+-- ----------------------------
+-- Table structure for kl_version_info
+-- ----------------------------
+DROP TABLE IF EXISTS `kl_version_info`;
+CREATE TABLE `kl_version_info` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `product_type` int(11) NOT NULL DEFAULT '0' COMMENT '产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）',
+  `name` varchar(200) DEFAULT NULL COMMENT '名称',
+  `refresh_time` date DEFAULT NULL,
+  `status` varchar(5) DEFAULT NULL COMMENT '1：启动，0：不启用',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='版本信息(关于)';
+
+INSERT INTO `med`.`kl_version_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `refresh_time`, `status`, `remark`) SELECT `id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `refresh_time`, `status`, `remark` FROM `sys-icss`.`icss_version_info`;
+
+UPDATE `med`.`kl_version_info` SET `product_type` = 3;
+
+INSERT INTO `med`.`kl_version_detail` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `version_id`, `title`, `description`, `order_no`, `status`, `remark`) SELECT `id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `version_id`, `title`, `description`, `order_no`, `status`, `remark` FROM `sys-icss`.`icss_version_detail`;
+
+UPDATE `kl_version_info`
+SET `status` = 0
+WHERE
+	id NOT IN (
+		SELECT
+			b.id
+		FROM
+			(
+				SELECT
+					max(a.id) AS id,
+					product_type
+				FROM
+					`kl_version_info` a
+				GROUP BY
+					product_type
+			) b
+	);
+
+use `sys-icss`;
+DROP TABLE IF EXISTS `icss_version_info`;
+DROP TABLE IF EXISTS `icss_version_detail`;

docs/016.20190827全部产品线版本控制/init_user.sql

@@ -0,0 +1,945 @@
+use `sys-user`;
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 2.236平台开发环境
+Source Server Version : 50725
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50725
+File Encoding         : 65001
+
+Date: 2019-09-16 14:16:58
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu`;
+CREATE TABLE `sys_menu` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单名称',
+  `parent_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '-1：表示顶级,其他值表示上级菜单的id',
+  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '编码，与前端对应',
+  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序，从小到大',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8 COMMENT='系统菜单';
+
+-- ----------------------------
+-- Records of sys_menu
+-- ----------------------------
+INSERT INTO `sys_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台', '-1', 'YH-KZT', '1', '用户-控制台');
+INSERT INTO `sys_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '更多服务', '-1', 'YH-GDFW', '2', '用户-更多服务');
+INSERT INTO `sys_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '机构中心', '-1', 'YH-JGZX', '3', '用户-机构中心');
+INSERT INTO `sys_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '账号信息', '3', 'YH-JGZX-ZHXX', '1', '用户-机构中心-账号信息');
+INSERT INTO `sys_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已开通产品', '3', 'YH-JGZX-YKTCP', '2', '用户-机构中心-已开通产品');
+INSERT INTO `sys_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '安全设置', '3', 'YH-JGZX-AQSZ', '5', '用户-机构中心-安全设置');
+INSERT INTO `sys_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '管理服务端', '3', 'YH-JGZX-GLFFD', '3', '用户-机构中心-管理服务端');
+INSERT INTO `sys_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心', '-1', 'LT-KHZX', '2', '朗通-客户中心');
+INSERT INTO `sys_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '机构信息', '10', 'LT-KHZX-JGXX', '2', '朗通-客户中心-机构信息');
+INSERT INTO `sys_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台', '-1', 'LT-KZT', '1', '朗通-控制台');
+INSERT INTO `sys_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已生成令牌', '3', 'YH-JGZX-YSCLP', '4', '用户-机构中心-已生成令牌');
+INSERT INTO `sys_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '注册用户', '10', 'LT-KHZX-ZCYH', '1', '朗通-客户中心-注册用户');
+INSERT INTO `sys_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '审核超管信息', '10', 'LT-KHZX-CGXX', '3', '朗通-客户中心-超管信息');
+INSERT INTO `sys_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '订单系统', '-1', 'LT-DDXT', '3', '朗通-订单系统');
+INSERT INTO `sys_menu` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品申请列表', '17', 'LT-DDXT-CPXSQLB', '1', '朗通-订单系统-产品申请列表');
+INSERT INTO `sys_menu` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品线管理', '-1', 'LT-CPXGL', '4', '朗通-产品线管理');
+INSERT INTO `sys_menu` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '个人中心', '-1', 'LT-GRZX', '99', '朗通-个人中心');
+INSERT INTO `sys_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已认证超管信息', '10', 'LT-YRZCGXX', '0', '朗通-客户中心-已认证超管信息');
+INSERT INTO `sys_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品续费列表', '17', 'LT-CPXFLB', '2', '朗通-订单系统-产品续费列表');
+INSERT INTO `sys_menu` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护', '-1', 'LT-YXSJWH', '5', '朗通-ICSS数据维护');
+INSERT INTO `sys_menu` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '标签组维护', '23', 'LT-YXSJWH-BQZWH', '10', '朗通-ICSS数据维护-标签组维护');
+INSERT INTO `sys_menu` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '独立类型标签维护', '23', 'LT-YXSJWH-DLLXBQWH', '20', '朗通-ICSS数据维护-独立类型标签维护');
+INSERT INTO `sys_menu` VALUES ('27', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '别名维护', '23', 'LT-YXSJWH-BMWH', '25', '朗通-ICSS数据维护-别名维护');
+INSERT INTO `sys_menu` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模版维护', '23', 'LT-YXSJWH-MBWH', '30', '朗通-ICSS数据维护-模版维护');
+INSERT INTO `sys_menu` VALUES ('30', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'icss科室维护', '23', 'LT-YXSJWH-KSWH', '40', '朗通-ICSS数据维护-icss科室维护');
+INSERT INTO `sys_menu` VALUES ('31', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '常见选项维护', '23', 'LT-YXSJWH-CJXXWH', '45', '朗通-ICSS数据维护-常见选项维护');
+INSERT INTO `sys_menu` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '免责声明维护', '38', 'LT-YXSJKWH-MZSMWH', '90', '朗通-医学术语库维护-免责声明维护');
+INSERT INTO `sys_menu` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '版本信息维护', '60', 'LT-GBBXXWH-BBXXWH', '60', '朗通-各版本信息维护-版本信息维护');
+INSERT INTO `sys_menu` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查体模板维护', '23', 'LT-YXSJWH-CTMBWH', '40', '朗通-ICSS数据维护-查体模板维护');
+INSERT INTO `sys_menu` VALUES ('37', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '提示信息维护', '23', 'LT-YXSJWH-TSXXWH', '50', '朗通-ICSS数据维护-提示信息维护');
+INSERT INTO `sys_menu` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护', '-1', 'LT-YXSYKWH', '6', '朗通-医学术语库维护');
+INSERT INTO `sys_menu` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语命名维护', '38', 'LT-YXSYKWH-YXSYMMWH', '10', '朗通-医学术语库维护-医学术语命名维护');
+INSERT INTO `sys_menu` VALUES ('40', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '术语医学属性维护', '38', 'LT-YXSYKWH-SYYXSXWH', '2', '朗通-医学术语库维护-术语医学属性维护');
+INSERT INTO `sys_menu` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语关系维护', '38', 'LT-YXSYKWH-YXSYGXWH', '20', '朗通-医学术语库维护-医学术语关系维护');
+INSERT INTO `sys_menu` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语静态知识维护', '38', 'LT-YXSYKWH-YXSYJTZSWH', '50', '朗通-医学术语库维护-医学术语静态知识维护');
+INSERT INTO `sys_menu` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验大小项与公表项对应维护', '23', 'LT-YXSJWH-HYDXXYGBXDY', '50', '朗通-ICSS数据维护-化验大小项与公表项对应维护');
+INSERT INTO `sys_menu` VALUES ('44', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '慢病管理与评估维护', '23', 'LT-YXSJWH-MBGLYPG', '75', '朗通-ICSS数据维护-慢病管理与评估维护');
+INSERT INTO `sys_menu` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '慢病指标值关联维护', '38', 'LT-YXSYKWH-MBZBZGLWH', '70', '朗通-医学术语库维护-慢病指标值关联维护');
+INSERT INTO `sys_menu` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表结构维护', '38', 'LT-YXSYKWH-LBJGWH', '60', '朗通-医学术语库维护-量表结构维护');
+INSERT INTO `sys_menu` VALUES ('49', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语类型维护', '38', 'LT-YXSYKWH-YXSYLXWH', '5', '朗通-医学术语库维护-医学术语类型维护');
+INSERT INTO `sys_menu` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验子项维护', '38', 'LT-YXSYKWH-HYZXWH', '80', '朗通-医学术语库维护-化验子项维护');
+INSERT INTO `sys_menu` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语关联维护', '38', 'LT-YXSYKWH-YXSYGLWH', '30', '朗通-医学术语库维护-医学术语关联维护');
+INSERT INTO `sys_menu` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分诊人体图数据维护', '38', 'LT-YXSYKWH-YXSYDCGLWH', '40', '朗通-医学术语库维护-医学术语多层关联维护');
+INSERT INTO `sys_menu` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护', '-1', 'LT-YWZSJWH', '8', '朗通-预问诊数据维护');
+INSERT INTO `sys_menu` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '独立填写单维护', '53', 'LT-YWZSJWH-DLTXDWH', '1', '朗通-预问诊数据维护-独立填写单维护');
+INSERT INTO `sys_menu` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '组合填写单维护', '53', 'LT-YWZSJWH-ZHTXDWH', '2', '朗通-预问诊数据维护-组合填写单维护');
+INSERT INTO `sys_menu` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模版维护', '53', 'LT-YWZSJWH-MBWH', '3', '朗通-预问诊数据维护-模版维护');
+INSERT INTO `sys_menu` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护', '-1', 'LT-ZDYJWH', '10', '朗通-诊断依据维护');
+INSERT INTO `sys_menu` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据数据维护', '57', 'LT-ZDYJWH-ZDYJSJWH', '10', '朗通-诊断依据维护-诊断依据数据维护');
+INSERT INTO `sys_menu` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '问题词数据维护', '57', 'LT-ZDYJWH-WTCSJWH', '20', '朗通-诊断依据维护-问题词数据维护');
+INSERT INTO `sys_menu` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护', '-1', 'LT-GBBXXWH', '11', '朗通-各版本信息维护');
+
+-- ----------------------------
+-- Table structure for sys_menu_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu_permission`;
+CREATE TABLE `sys_menu_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
+  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统资源id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=247 DEFAULT CHARSET=utf8 COMMENT='菜单和系统资源的映射表';
+
+-- ----------------------------
+-- Records of sys_menu_permission
+-- ----------------------------
+INSERT INTO `sys_menu_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '8', '朗通-客户中心-获取用户信息列表');
+INSERT INTO `sys_menu_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '12', '朗通-客户中心-修改用户和机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '14', '朗通-客户中心-根据用户Id删除');
+INSERT INTO `sys_menu_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '18', '朗通-客户中心-模糊查询机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '19', '朗通-客户中心-添加机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '20', '朗通-客户中心-添加用户信息和绑定机构');
+INSERT INTO `sys_menu_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '22', '朗通-客户中心-审核用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '15', '用户-机构中心-已开通产品-关联产品与用户服务端');
+INSERT INTO `sys_menu_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '16', '用户-机构中心-已开通产品-删除产品与用户服务端的关联');
+INSERT INTO `sys_menu_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '17', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '24', '用户-机构中心-管理服务端-新增服务端');
+INSERT INTO `sys_menu_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '25', '用户-机构中心-管理服务端-修改服务端');
+INSERT INTO `sys_menu_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '26', '用户-机构中心-管理服务端-获取当前登录用户的服务列表');
+INSERT INTO `sys_menu_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '27', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '31', '朗通-客户中心-根据用户id和产品id，修改开通时间');
+INSERT INTO `sys_menu_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '28', '朗通-客户中心-根据用户id查询已开通的功能');
+INSERT INTO `sys_menu_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '29', '朗通-客户中心-根据用户id和产品id，启用和停用功能');
+INSERT INTO `sys_menu_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '30', '朗通-客户中心-根据用户id和产品id，删除开通信息');
+INSERT INTO `sys_menu_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '32', '朗通-客户中心-根据时间导出用户和机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '9', '用户-机构中心-账户信息-获取当前用户信息');
+INSERT INTO `sys_menu_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '10', '用户-机构中心-账户信息-用户认证');
+INSERT INTO `sys_menu_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '11', '用户-机构中心-账户信息-获取当前用户认证状态');
+INSERT INTO `sys_menu_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '33', '用户-机构中心-已经生成令牌-生成令牌');
+INSERT INTO `sys_menu_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '34', '用户-机构中心-已经生成令牌-禁用令牌');
+INSERT INTO `sys_menu_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '35', '用户-机构中心-已经生成令牌-启用令牌');
+INSERT INTO `sys_menu_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '36', '用户-机构中心-已经生成令牌-删除令牌');
+INSERT INTO `sys_menu_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '37', '朗通-控制台-待审核订单个数');
+INSERT INTO `sys_menu_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '38', '朗通-控制台-待认证账号数量');
+INSERT INTO `sys_menu_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '39', '用户-控制台-账号认证进度');
+INSERT INTO `sys_menu_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '40', '用户-控制台-产品认证进度');
+INSERT INTO `sys_menu_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', '用户-控制台-已开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', '用户-控制台-可试用产品');
+INSERT INTO `sys_menu_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '43', '用户-控制台-产品立即试用接口');
+INSERT INTO `sys_menu_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '44', '用户-控制台-可展示的选项卡');
+INSERT INTO `sys_menu_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '用户-控制台-账户信息');
+INSERT INTO `sys_menu_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '46', '朗通-客户中心-查询所有用户已开通的功能');
+INSERT INTO `sys_menu_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '47', '朗通-客户中心-查询用户信息和机构信息开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '48', '朗通-个人中心-重置密码');
+INSERT INTO `sys_menu_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '51', '用户-更多服务-根据用户id获取产品信息');
+INSERT INTO `sys_menu_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '52', '用户-更多服务-开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '53', '朗通-产品线管理-添加产品');
+INSERT INTO `sys_menu_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '54', '用户-机构中心-管理服务端-删除服务端');
+INSERT INTO `sys_menu_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '21', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表');
+INSERT INTO `sys_menu_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '64', '朗通-客户中心-分页查询注册用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '65', '朗通-客户中心-分页查询机构信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '66', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口');
+INSERT INTO `sys_menu_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '67', '朗通-客户中心-分页查询认证中的用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '71', '客户中心-导出用户信息');
+INSERT INTO `sys_menu_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '72', '客户中心-导出机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '73', '客户中心-导出认证中用户的信息:');
+INSERT INTO `sys_menu_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '74', '客户中心-导出已认证用户的信息');
+INSERT INTO `sys_menu_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '76', '客户中心-超管修改用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '77', '客户中心-超管修改机构信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '79', '用户-机构中心-已经生成令牌-获取令牌');
+INSERT INTO `sys_menu_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '83', '客户中心-认证用户信息和机构信息不通过接口(新)');
+INSERT INTO `sys_menu_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '84', '客户中心-认证用户信息和机构信息通过接口(新)');
+INSERT INTO `sys_menu_permission` VALUES ('77', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '85', '客户中心-查询用户续费数量');
+INSERT INTO `sys_menu_permission` VALUES ('78', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '86', '客户中心-查询用户是否有待审核的产品数量');
+INSERT INTO `sys_menu_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '25', '88', 'ICSS数据维护-独立标签维护-新增|修改');
+INSERT INTO `sys_menu_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '25', '89', 'ICSS数据维护-独立标签维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '25', '90', 'ICSS数据维护-独立标签维护-分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '91', 'ICSS数据维护-标签组维护-新增|修改');
+INSERT INTO `sys_menu_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '92', 'ICSS数据维护-标签组维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '93', 'ICSS数据维护-标签组维护-分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '94', 'ICSS数据维护-标签组维护-获取特殊标签（同伴|无）');
+INSERT INTO `sys_menu_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '95', 'ICSS数据维护-标签组维护-根据id返回内容');
+INSERT INTO `sys_menu_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '96', 'ICSS数据维护-标签组维护-根据多个id返回内容');
+INSERT INTO `sys_menu_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '98', 'ICSS数据维护-标签组维护-检索');
+INSERT INTO `sys_menu_permission` VALUES ('92', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '99', 'ICSS数据维护-科室维护-修改');
+INSERT INTO `sys_menu_permission` VALUES ('93', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '100', 'ICSS数据维护-科室维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('94', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '101', 'ICSS数据维护-科室维护-查询');
+INSERT INTO `sys_menu_permission` VALUES ('95', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '102', 'ICSS数据维护-科室维护-详情');
+INSERT INTO `sys_menu_permission` VALUES ('96', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '104', 'ICSS数据维护-科室维护-添加');
+INSERT INTO `sys_menu_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '105', 'ICSS数据维护-别名维护-新增|修改');
+INSERT INTO `sys_menu_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '106', 'ICSS数据维护-别名维护-详情');
+INSERT INTO `sys_menu_permission` VALUES ('99', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '107', 'ICSS数据维护-别名维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('100', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '108', 'ICSS数据维护-别名维护-导入');
+INSERT INTO `sys_menu_permission` VALUES ('101', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '109', 'ICSS数据维护-别名维护-列表');
+INSERT INTO `sys_menu_permission` VALUES ('102', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '110', 'ICSS数据维护-模板维护-添加');
+INSERT INTO `sys_menu_permission` VALUES ('103', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '111', 'ICSS数据维护-模板维护-修改');
+INSERT INTO `sys_menu_permission` VALUES ('104', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '112', 'ICSS数据维护-模板维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('105', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '113', 'ICSS数据维护-模板维护-获取标签池信息');
+INSERT INTO `sys_menu_permission` VALUES ('106', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '114', 'ICSS数据维护-模板维护-获取子模板信息');
+INSERT INTO `sys_menu_permission` VALUES ('107', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '115', 'ICSS数据维护-模板维护-获取模板列表');
+INSERT INTO `sys_menu_permission` VALUES ('108', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '116', 'ICSS数据维护-模板维护-获取模板明细信息');
+INSERT INTO `sys_menu_permission` VALUES ('109', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '117', 'ICSS数据维护-模板维护-获取单个模板信息（修改用）');
+INSERT INTO `sys_menu_permission` VALUES ('110', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '118', 'ICSS数据维护-常见症状维护-添加和修改');
+INSERT INTO `sys_menu_permission` VALUES ('111', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '119', 'ICSS数据维护-常见选项维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('112', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '120', 'ICSS数据维护-常见选项维护-获取科室名称');
+INSERT INTO `sys_menu_permission` VALUES ('113', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '121', 'ICSS数据维护-常见选项维护-获取标签信息');
+INSERT INTO `sys_menu_permission` VALUES ('114', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '122', 'ICSS数据维护-常见选项维护-根据科室获取常用标签信息(修改和详情用)');
+INSERT INTO `sys_menu_permission` VALUES ('115', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '123', 'ICSS数据维护-常见选项维护-获取科室信息(常见症状维护系统页面查询)');
+INSERT INTO `sys_menu_permission` VALUES ('116', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '124', 'ICSS数据维护-免责申明-获取免责申明详情');
+INSERT INTO `sys_menu_permission` VALUES ('117', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '125', 'ICSS数据维护-免责申明-增加免责申明详情');
+INSERT INTO `sys_menu_permission` VALUES ('118', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '126', 'ICSS数据维护-免责申明-修改免责申明详情');
+INSERT INTO `sys_menu_permission` VALUES ('119', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '127', 'ICSS数据维护-免责申明-删除免责申明详情');
+INSERT INTO `sys_menu_permission` VALUES ('120', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '128', 'ICSS数据维护-免责申明-启用免责申明详情 ');
+INSERT INTO `sys_menu_permission` VALUES ('121', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '129', 'ICSS数据维护-免责申明-停用免责申明详情');
+INSERT INTO `sys_menu_permission` VALUES ('122', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '130', '各版本信息维护-版本信息维护-获取版本信息');
+INSERT INTO `sys_menu_permission` VALUES ('123', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '131', '各版本信息维护-版本信息维护-保存版本信息');
+INSERT INTO `sys_menu_permission` VALUES ('124', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '132', '各版本信息维护-版本信息维护-更新版本信息');
+INSERT INTO `sys_menu_permission` VALUES ('125', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '133', '各版本信息维护-版本信息维护-删除版本信息');
+INSERT INTO `sys_menu_permission` VALUES ('126', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '134', '各版本信息维护-版本信息维护-更新版本详情信息');
+INSERT INTO `sys_menu_permission` VALUES ('127', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '135', '各版本信息维护-版本信息维护-删除版本详情信息');
+INSERT INTO `sys_menu_permission` VALUES ('128', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '136', '各版本信息维护-版本信息维护-增加版本详情信息');
+INSERT INTO `sys_menu_permission` VALUES ('129', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '137', 'ICSS数据维护-查体模板维护-查体模板列表');
+INSERT INTO `sys_menu_permission` VALUES ('130', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '138', 'ICSS数据维护-查体模板维护-保存');
+INSERT INTO `sys_menu_permission` VALUES ('131', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '139', 'ICSS数据维护-查体模板维护-根据科室删除');
+INSERT INTO `sys_menu_permission` VALUES ('132', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '140', 'ICSS数据维护-查体模板维护-获取未维护的科室（新增）');
+INSERT INTO `sys_menu_permission` VALUES ('133', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '141', 'ICSS数据维护-查体模板维护-获取未维护的科室（修改）');
+INSERT INTO `sys_menu_permission` VALUES ('134', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '142', 'ICSS数据维护-查体模板维护-根据科室获取查体模板');
+INSERT INTO `sys_menu_permission` VALUES ('153', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '34', '161', '各版本信息维护-版本信息维护-根据版本id获取版本详情信息');
+INSERT INTO `sys_menu_permission` VALUES ('154', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '162', '医学术语库维护-医学术语命名维护-获取所有医学术语命名');
+INSERT INTO `sys_menu_permission` VALUES ('155', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '163', '医学术语库维护-医学术语命名维护-获取医学术语命名列表');
+INSERT INTO `sys_menu_permission` VALUES ('156', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '164', '医学术语库维护-医学术语命名维护-医学术语命名删除');
+INSERT INTO `sys_menu_permission` VALUES ('157', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '165', '医学术语库维护-医学术语命名维护-获取医学术语命名详情');
+INSERT INTO `sys_menu_permission` VALUES ('158', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '166', '医学术语库维护-术语医学属性维护-获取医学术语信息');
+INSERT INTO `sys_menu_permission` VALUES ('159', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '167', '医学术语库维护-术语医学属性维护-保存医学术语信息');
+INSERT INTO `sys_menu_permission` VALUES ('160', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '168', '医学术语库维护-术语医学属性维护-更新医学术语信息');
+INSERT INTO `sys_menu_permission` VALUES ('161', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '169', '医学术语库维护-术语医学属性维护-删除医学术语信息');
+INSERT INTO `sys_menu_permission` VALUES ('162', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '170', '医学术语库维护-医学术语关系维护-获取医学术语关系列表');
+INSERT INTO `sys_menu_permission` VALUES ('163', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '171', '医学术语库维护-医学术语关系维护-医学术语关系删除');
+INSERT INTO `sys_menu_permission` VALUES ('164', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '172', '医学术语库维护-医学术语关系维护-获取医学术语关系详情');
+INSERT INTO `sys_menu_permission` VALUES ('165', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '173', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识列表');
+INSERT INTO `sys_menu_permission` VALUES ('166', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '174', '医学术语库维护-医学术语静态知识维护-医学术语静态知识删除');
+INSERT INTO `sys_menu_permission` VALUES ('167', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '175', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识详情');
+INSERT INTO `sys_menu_permission` VALUES ('168', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '176', '医学术语库维护-医学术语静态知识维护-医学术语静态知识添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('169', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '177', 'ICSS数据维护-别名维护-标签搜索');
+INSERT INTO `sys_menu_permission` VALUES ('170', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '43', '178', 'ICSS数据维护-化验大小项与公表项对应维护-分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('171', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '43', '179', 'ICSS数据维护-化验大小项与公表项对应维护-保存');
+INSERT INTO `sys_menu_permission` VALUES ('172', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '43', '180', 'ICSS数据维护-化验大小项与公表项对应维护-是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('173', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '43', '181', 'ICSS数据维护-化验大小项与公表项对应维护-删除(单条)');
+INSERT INTO `sys_menu_permission` VALUES ('174', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '43', '182', 'ICSS数据维护-化验大小项与公表项对应维护-删除(批量)');
+INSERT INTO `sys_menu_permission` VALUES ('175', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '183', 'ICSS数据维护-获取模板type');
+INSERT INTO `sys_menu_permission` VALUES ('176', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '184', 'ICSS数据维护-慢病评估维护-分页模糊查询标签组维护接口');
+INSERT INTO `sys_menu_permission` VALUES ('177', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '185', 'ICSS数据维护-慢病评估维护-获取慢病标签组维护');
+INSERT INTO `sys_menu_permission` VALUES ('178', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '186', 'ICSS数据维护-慢病评估维护-慢病评估维护——修改管理评估');
+INSERT INTO `sys_menu_permission` VALUES ('179', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '187', 'ICSS数据维护-慢病评估维护-慢病评估维护——添加管理评估');
+INSERT INTO `sys_menu_permission` VALUES ('180', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '188', 'ICSS数据维护-慢病评估维护-删除慢病标签组维护');
+INSERT INTO `sys_menu_permission` VALUES ('181', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '189', 'ICSS数据维护-慢病指标值关联维护-分页模糊查询慢病指标值关联维护');
+INSERT INTO `sys_menu_permission` VALUES ('182', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '190', 'ICSS数据维护-慢病指标值关联维护-获取慢病指标值关联维护');
+INSERT INTO `sys_menu_permission` VALUES ('183', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '191', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——修改关联');
+INSERT INTO `sys_menu_permission` VALUES ('184', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '192', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——添加关联');
+INSERT INTO `sys_menu_permission` VALUES ('185', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '193', 'ICSS数据维护-慢病指标值关联维护-删除慢病指标值关联维护');
+INSERT INTO `sys_menu_permission` VALUES ('190', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '209', '医学术语库维护-术语医学属性维护-术语医学属性excel文件导入');
+INSERT INTO `sys_menu_permission` VALUES ('191', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '210', '医学术语库维护-医学术语关系维护-医学术语关系添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('192', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '211', '医学术语库维护-医学术语关系维护-医学术语关系excel文件导入');
+INSERT INTO `sys_menu_permission` VALUES ('193', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '213', '医学术语库维护-医学术语命名维护-医学术语命名添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('194', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '214', '医学术语库维护-医学术语命名维护-医学术语命名excel文件导入');
+INSERT INTO `sys_menu_permission` VALUES ('195', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '49', '215', '医学术语库维护-医学术语类型维护-获取所有术语类型');
+INSERT INTO `sys_menu_permission` VALUES ('196', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '49', '216', '医学术语库维护-医学术语类型维护-获取术语类型列表');
+INSERT INTO `sys_menu_permission` VALUES ('197', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '49', '217', '医学术语库维护-医学术语类型维护-术语类型添加');
+INSERT INTO `sys_menu_permission` VALUES ('198', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '41', '218', '医学术语库维护-医学术语关系维护-获取所有关系类型');
+INSERT INTO `sys_menu_permission` VALUES ('199', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '219', '医学术语库维护-术语医学属性维护-获取所有部位');
+INSERT INTO `sys_menu_permission` VALUES ('200', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '40', '220', '医学术语库维护-术语医学属性维护-获取术语医学属性所需全部科室');
+INSERT INTO `sys_menu_permission` VALUES ('201', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '221', '医学术语库维护-量表结构维护-新增|修改');
+INSERT INTO `sys_menu_permission` VALUES ('202', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '222', '医学术语库维护-量表结构维护-分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('203', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '224', '医学术语库维护-量表结构维护-删除|恢复');
+INSERT INTO `sys_menu_permission` VALUES ('204', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '225', '医学术语库维护-量表结构维护-根据id返回内容');
+INSERT INTO `sys_menu_permission` VALUES ('205', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '91', '医学数据维护-标签组维护-新增|修改');
+INSERT INTO `sys_menu_permission` VALUES ('206', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '223', '医学术语库维护-医学术语命名维护-获取所有化验公表项');
+INSERT INTO `sys_menu_permission` VALUES ('207', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '228', 'ICSS数据维护-模板维护-获取所有科室和疾病信息');
+INSERT INTO `sys_menu_permission` VALUES ('208', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '44', '230', 'ICSS数据维护-慢病评估维护-慢病疾病标签查询');
+INSERT INTO `sys_menu_permission` VALUES ('209', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '45', '229', 'ICSS数据维护-慢病指标值关联维护-慢病指标疾病标签查询');
+INSERT INTO `sys_menu_permission` VALUES ('210', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '24', '231', 'ICSS数据维护-标签组维护-子标签检索');
+INSERT INTO `sys_menu_permission` VALUES ('211', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '232', 'ICSS数据维护-模板维护-获取标签和模板关联信息（删除标签时校验用）');
+INSERT INTO `sys_menu_permission` VALUES ('212', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '35', '233', 'ICSS数据维护-查体模板维护-查询科室下拉列表(查询页面)');
+INSERT INTO `sys_menu_permission` VALUES ('213', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '48', '227', '医学术语库维护-量表结构维护-检索');
+INSERT INTO `sys_menu_permission` VALUES ('214', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '39', '234', '医学术语库维护-医学术语命名维护-获取所有概念(术语关系维护时筛选使用)');
+INSERT INTO `sys_menu_permission` VALUES ('215', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '50', '235', '医学术语库维护-化验子项维护-列表');
+INSERT INTO `sys_menu_permission` VALUES ('216', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '50', '236', '医学术语库维护-化验子项维护-添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('217', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '50', '237', '医学术语库维护-化验子项维护-详情');
+INSERT INTO `sys_menu_permission` VALUES ('218', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '50', '238', '医学术语库维护-化验子项维护-删除或者恢复');
+INSERT INTO `sys_menu_permission` VALUES ('219', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '51', '239', '医学术语库维护-医学术语关联维护-列表');
+INSERT INTO `sys_menu_permission` VALUES ('220', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '51', '240', '医学术语库维护-医学术语关联维护-添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('221', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '51', '241', '医学术语库维护-医学术语关联维护-详情');
+INSERT INTO `sys_menu_permission` VALUES ('222', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '51', '242', '医学术语库维护-医学术语关联维护-删除或者恢复');
+INSERT INTO `sys_menu_permission` VALUES ('223', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '52', '243', '医学术语库维护-医学术语多层关联维护-列表');
+INSERT INTO `sys_menu_permission` VALUES ('224', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '52', '244', '医学术语库维护-医学术语多层关联维护-添加或者编辑');
+INSERT INTO `sys_menu_permission` VALUES ('225', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '52', '245', '医学术语库维护-医学术语多层关联维护-详情');
+INSERT INTO `sys_menu_permission` VALUES ('226', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '52', '246', '医学术语库维护-医学术语多层关联维护-删除或者恢复');
+INSERT INTO `sys_menu_permission` VALUES ('227', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '247', '医学术语库维护-医学术语静态知识维护-内容检索');
+INSERT INTO `sys_menu_permission` VALUES ('228', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '260', '预问诊数据维护-模板维护-模板新增');
+INSERT INTO `sys_menu_permission` VALUES ('230', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '262', '预问诊数据维护-模板维护-模板删除');
+INSERT INTO `sys_menu_permission` VALUES ('231', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '263', '预问诊数据维护-模板维护-获取模板列表');
+INSERT INTO `sys_menu_permission` VALUES ('232', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '264', '预问诊数据维护-模板维护-修改时获取已经添加过的标签');
+INSERT INTO `sys_menu_permission` VALUES ('233', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '265', '预问诊数据维护-模板维护-获取单个模板(修改用)');
+INSERT INTO `sys_menu_permission` VALUES ('234', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '266', '预问诊数据维护-模板维护-获取模板类型(修改时取类型)');
+INSERT INTO `sys_menu_permission` VALUES ('235', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '267', '预问诊数据维护-模板维护-获取所有科室信息(主页下拉用)');
+INSERT INTO `sys_menu_permission` VALUES ('236', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '56', '268', '预问诊数据维护-模板维护-获取标签和模板关联信息');
+INSERT INTO `sys_menu_permission` VALUES ('237', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '272', '诊断依据维护-诊断依据数据维护-分页');
+INSERT INTO `sys_menu_permission` VALUES ('238', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '273', '诊断依据维护-诊断依据数据维护-删除');
+INSERT INTO `sys_menu_permission` VALUES ('239', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '274', '诊断依据维护-诊断依据数据维护-诊断检索');
+INSERT INTO `sys_menu_permission` VALUES ('240', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '275', '诊断依据维护-诊断依据数据维护-校验数据');
+INSERT INTO `sys_menu_permission` VALUES ('241', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '276', '诊断依据维护-诊断依据数据维护-校验所有数据');
+INSERT INTO `sys_menu_permission` VALUES ('242', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '277', '诊断依据维护-诊断依据数据维护-更新图谱');
+INSERT INTO `sys_menu_permission` VALUES ('243', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '278', '诊断依据维护-诊断依据数据维护-获取详情');
+INSERT INTO `sys_menu_permission` VALUES ('244', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '58', '270', '诊断依据维护-导出诊断依据');
+INSERT INTO `sys_menu_permission` VALUES ('245', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '59', '269', '诊断依据维护-导出诊断依据问题词');
+INSERT INTO `sys_menu_permission` VALUES ('246', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '59', '271', '诊断依据维护-诊断依据问题词数据维护-分页查询');
+
+-- ----------------------------
+-- Table structure for sys_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_permission`;
+CREATE TABLE `sys_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '资源ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '资源名称',
+  `permissionUrl` varchar(255) NOT NULL DEFAULT '' COMMENT '资源Url',
+  `method` varchar(255) NOT NULL DEFAULT 'ALL' COMMENT '资源允许的请求方式',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '资源描述',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=279 DEFAULT CHARSET=utf8 COMMENT='系统资源表';
+
+-- ----------------------------
+-- Records of sys_permission
+-- ----------------------------
+INSERT INTO `sys_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户信息列表', '/userInfo/getUserInfoPag', 'ALL', '朗通-客户中心-获取用户信息列表', null);
+INSERT INTO `sys_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-获取当前用户信息', '/userAuthentication/getuserAuthenticationInfo', 'ALL', '用户-机构中心-账户信息-获取当前用户信息', null);
+INSERT INTO `sys_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-用户认证', '/userAuthentication/userAuthentication', 'ALL', '用户-机构中心-账户信息-用户认证', null);
+INSERT INTO `sys_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-获取当前用户认证状态', '/userAuthentication/getUserAuthenticationStatus', 'ALL', '用户-机构中心-账户信息-获取当前用户认证状态', null);
+INSERT INTO `sys_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改用户和机构信息', '/userInfo/updateUserInfoAll', 'ALL', '朗通-客户中心-修改用户和机构信息', null);
+INSERT INTO `sys_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户Id删除', '/userInfo/updateDeleted', 'ALL', '朗通-客户中心-根据用户Id删除', null);
+INSERT INTO `sys_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-关联产品与用户服务端', '/productService/genProductService', 'ALL', '用户-机构中心-已开通产品-关联产品与用户服务端', null);
+INSERT INTO `sys_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-删除产品与用户服务端的关联', '/productService/deleteProductService', 'ALL', '用户-机构中心-已开通产品-删除产品与用户服务端的关联', null);
+INSERT INTO `sys_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表', '/productService/getProductServiceByCurrentUser', 'ALL', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表', null);
+INSERT INTO `sys_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模糊查询机构信息', '/userInfo/findOrganization', 'ALL', '朗通-客户中心-模糊查询机构信息', null);
+INSERT INTO `sys_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '添加机构信息', '/userInfo/addOrganization', 'ALL', '朗通-客户中心-添加机构信息', null);
+INSERT INTO `sys_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '添加用户信息和绑定机构', '/userInfo/addUserInfo', 'ALL', '朗通-客户中心-添加用户信息和绑定机构', null);
+INSERT INTO `sys_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表', '/diagLantoneProduct/opendedProductByCurrentUser', 'ALL', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表', null);
+INSERT INTO `sys_permission` VALUES ('22', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '审核用户信息接口', '/userInfo/auditUserInfoAll', 'ALL', '朗通-客户中心-审核用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-新增服务端', '/serviceInfo/createService', 'ALL', '用户-机构中心-管理服务端-新增服务端', null);
+INSERT INTO `sys_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-修改服务端', '/serviceInfo/updateService', 'ALL', '用户-机构中心-管理服务端-修改服务端', null);
+INSERT INTO `sys_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-获取当前登录用户的服务列表', '/serviceInfo/getServiceListByCurrentUser', 'ALL', '用户-机构中心-管理服务端-获取当前登录用户的服务列表', null);
+INSERT INTO `sys_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表', '/serviceInfo/getServiceListPageByCurrentUser', 'ALL', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表', null);
+INSERT INTO `sys_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id查询已开通的功能', '/productOrder/getInformationAvailableByUserId', 'ALL', '朗通-客户中心-根据用户id查询已开通的功能', null);
+INSERT INTO `sys_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，启用和停用功能', '/productOrder/startAndendByuserId', 'ALL', '朗通-客户中心-根据用户id和产品id，启用和停用功能', null);
+INSERT INTO `sys_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，删除开通信息', '/productOrder/delInformationAvailable', 'ALL', '朗通-客户中心-根据用户id和产品id，删除开通信息', null);
+INSERT INTO `sys_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，修改开通时间', '/productOrder/modifyOpeningTime', 'ALL', '朗通-客户中心-根据用户id和产品id，修改开通时间', null);
+INSERT INTO `sys_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据时间导出用户和机构信息', '/report/exportUserInfoAll', 'ALL', '朗通-客户中心-根据时间导出用户和机构信息', null);
+INSERT INTO `sys_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-生成令牌', '/serviceToken/createServiceToken', 'ALL', '用户-机构中心-已经生成令牌-生成令牌', null);
+INSERT INTO `sys_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-禁用令牌', '/serviceToken/disableToken', 'ALL', '用户-机构中心-已经生成令牌-禁用令牌', null);
+INSERT INTO `sys_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-启用令牌', '/serviceToken/enableToken', 'ALL', '用户-机构中心-已经生成令牌-启用令牌', null);
+INSERT INTO `sys_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-删除令牌', '/serviceToken/deleteTokenByProductServiceId', 'ALL', '用户-机构中心-已经生成令牌-删除令牌', null);
+INSERT INTO `sys_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-控制台-待审核订单个数', '/productOrder/waitExamOrderCou', 'ALL', '朗通-控制台-待审核订单个数', null);
+INSERT INTO `sys_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-控制台-待认证账号数量', '/userAuthentication/waitAuthen', 'ALL', '朗通-控制台-待认证账号数量', null);
+INSERT INTO `sys_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-账号认证进度', '/userAuthentication/queryAuthProgress', 'ALL', '用户-控制台-账号认证进度', null);
+INSERT INTO `sys_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-产品认证进度', '/productOrder/productAuthProgress', 'ALL', '用户-控制台-产品认证进度', null);
+INSERT INTO `sys_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-已开通产品', '/productOrder/getConsoleOpened', 'ALL', '用户-控制台-已开通产品', null);
+INSERT INTO `sys_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-可试用产品', '/productOrder/getConsoleOnTrial', 'ALL', '用户-控制台-可试用产品', null);
+INSERT INTO `sys_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-产品立即试用接口', '/productOrder/openUpOnTrial', 'ALL', '用户-控制台-产品立即试用接口', null);
+INSERT INTO `sys_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-可展示的选项卡', '/productOrder/enShowOption', 'ALL', '用户-控制台-可展示的选项卡', null);
+INSERT INTO `sys_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-账户信息', '/user/getConsoleUserInfo', 'ALL', '用户-控制台-账户信息', null);
+INSERT INTO `sys_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询所有用户已开通的功能', '/productOrder/getInformationAvailableAll', 'ALL', '朗通-客户中心-查询所有用户已开通的功能', null);
+INSERT INTO `sys_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询用户信息和机构信息开通产品', '/userInfo/getUserOrganProductAll', 'ALL', '朗通-客户中心-查询用户信息和机构信息开通产品', null);
+INSERT INTO `sys_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-修改密码', '/user/midifyPassword', 'ALL', '朗通-个人中心-修改密码', null);
+INSERT INTO `sys_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-更多服务-显示产品', '/morServices/showProductInfo', 'ALL', '用户-更多服务-显示产品', null);
+INSERT INTO `sys_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-更多服务-开通产品', '/morServices/addOrder', 'ALL', '用户-更多服务-开通产品', null);
+INSERT INTO `sys_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-添加产品', '/diagLantoneProduct/addProducts', 'ALL', '朗通-产品线管理-添加产品', null);
+INSERT INTO `sys_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-删除服务端', '/serviceInfo/delService', 'ALL', '用户-机构中心-管理服务端-删除服务端', null);
+INSERT INTO `sys_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-查询', '/diagLantoneProduct/selectProduct', 'ALL', '朗通-产品线管理-查询', null);
+INSERT INTO `sys_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-修改', '/diagLantoneProduct/updateProduct', 'ALL', '朗通-产品线管理-修改', null);
+INSERT INTO `sys_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-(启用/禁用)', '/diagLantoneProduct/updateServiceStatus', 'ALL', '朗通-产品线管理-(启用/禁用)', null);
+INSERT INTO `sys_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-删除', '/diagLantoneProduct/deleteProduct', 'ALL', '朗通-产品线管理-删除', null);
+INSERT INTO `sys_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-详情', '/diagLantoneProduct/opendedProduct', 'ALL', '朗通-产品线管理-详情', null);
+INSERT INTO `sys_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-显示所有订单明细', '/diagOrderDetails/getAllOrderDetials', 'ALL', '朗通-产品申请-显示所有订单明细', null);
+INSERT INTO `sys_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-审核', '/diagOrderDetails/auditStatus', 'ALL', '朗通-产品申请-审核', null);
+INSERT INTO `sys_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-显示所有订单', '/productOrder/getAllProductOrder', 'ALL', '朗通-产品申请-显示所有订单', null);
+INSERT INTO `sys_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '默认-获取用户、机构、菜单信息', '/user/getUserOrgMenu', 'ALL', '全部用户-获取用户、机构、菜单信息', null);
+INSERT INTO `sys_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询注册用户信息接口', '/userInfo/queryUserInformation', 'ALL', '朗通-客户中心-分页查询注册用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询机构信息接口', '/userInfo/queryMechanismInformation', 'ALL', '朗通-客户中心-分页查询机构信息接口', null);
+INSERT INTO `sys_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口', '/userInfo/queryVerifiedUserOrganizationProduct', 'ALL', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口', null);
+INSERT INTO `sys_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询认证中的用户信息接口', '/userInfo/queryAuthentication', 'ALL', '朗通-客户中心-分页查询认证中的用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '\r\n导出产品申请相关信息', '/reporExcel/exportProductOrderInfo', 'ALL', '导出产品申请相关信息', null);
+INSERT INTO `sys_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-获取个人信息', '/user/getPersonInfo', 'ALL', '朗通-个人中心-获取个人信息', null);
+INSERT INTO `sys_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-修改个人信息', '/user/updatePersonInfo', 'ALL', '朗通-个人中心-修改个人信息', null);
+INSERT INTO `sys_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出用户信息', '/report/exportUserInfo', 'ALL', '客户中心-导出用户信息', null);
+INSERT INTO `sys_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出机构信息', '/report/exportOrganization', 'ALL', '客户中心-导出机构信息', null);
+INSERT INTO `sys_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出认证中用户的信息:', '/report/exportKema', 'ALL', '客户中心-导出认证中用户的信息:', null);
+INSERT INTO `sys_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出已认证用户的信息', '/report/exportVerified', 'ALL', '客户中心-导出已认证用户的信息', null);
+INSERT INTO `sys_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户更多服务-产品续费', '/morServices/addRenewalsInfo', 'ALL', '用户更多服务-产品续费', null);
+INSERT INTO `sys_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-超管修改用户信息接口', '/userInfo/updateUserInfo', 'ALL', '客户中心-超管修改用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-超管修改机构信息接口', '/userInfo/updateOrganizations', 'ALL', '客户中心-超管修改机构信息接口', null);
+INSERT INTO `sys_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-显示', '/userRenewals/renewalsInfos', 'ALL', '续费管理-显示', null);
+INSERT INTO `sys_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-获取令牌', '/serviceToken/getTokenByProductServiceId', 'ALL', '用户-机构中心-已经生成令牌-获取令牌', null);
+INSERT INTO `sys_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-删除', '/userRenewals/deleteRenewalsInfos', 'ALL', '续费管理-删除', null);
+INSERT INTO `sys_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-续费', '/productOrder/modifyOpeningTime', 'ALL', '续费管理-续费', null);
+INSERT INTO `sys_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-取消续费', '/userRenewals/cancelRenewalsInfos', 'ALL', '续费管理-取消续费', null);
+INSERT INTO `sys_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-认证用户信息和机构信息不通过接口(新)', '/userInfo/auditUserInfoAllNopass', 'ALL', '客户中心-认证用户信息和机构信息不通过接口(新)', null);
+INSERT INTO `sys_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-认证用户信息和机构信息通过接口(新)', '/userInfo/auditUserInfoAllPass', 'ALL', '客户中心-认证用户信息和机构信息通过接口(新)', null);
+INSERT INTO `sys_permission` VALUES ('85', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-查询用户续费数量', '/productOrder/getUserWaitingRenewal', 'ALL', '客户中心-查询用户续费数量', null);
+INSERT INTO `sys_permission` VALUES ('86', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-查询用户是否有待审核的产品数量', '/productOrder/getOrderByUserToAudit', 'ALL', '客户中心-查询用户是否有待审核的产品数量', null);
+INSERT INTO `sys_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-已开通产品状态校验', '/productOrder/openProductCheck', 'ALL', '客户中心-已开通产品状态校验', null);
+INSERT INTO `sys_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-新增|修改', '/questionInfo/saveOrUpdate', 'ALL', 'ICSS数据维护-独立标签维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-删除', '/questionInfo/delete', 'ALL', 'ICSS数据维护-独立标签维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-分页列表', '/questionInfo/list', 'ALL', 'ICSS数据维护-独立标签维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-新增|修改', '/questionInfo/saveOrUpdate', 'ALL', 'ICSS数据维护-标签组维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-删除', '/questionInfo/delete', 'ALL', 'ICSS数据维护-标签组维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-分页列表', '/questionInfo/list', 'ALL', 'ICSS数据维护-标签组维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-获取特殊标签（同伴|无）', '/questionInfo/getSpecial', 'ALL', 'ICSS数据维护-标签组维护-获取特殊标签（同伴|无）', null);
+INSERT INTO `sys_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-根据id返回内容', '/questionInfo/getById', 'ALL', 'ICSS数据维护-标签组维护-根据id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-根据多个id返回内容', '/questionInfo/getByIds', 'ALL', 'ICSS数据维护-标签组维护-根据多个id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-检索', '/questionInfo/index', 'ALL', 'ICSS数据维护-标签组维护-检索', null);
+INSERT INTO `sys_permission` VALUES ('99', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-科室维护-修改', '/deptInfo/updateDeptInfo', 'ALL', 'ICSS数据维护-科室维护-修改', null);
+INSERT INTO `sys_permission` VALUES ('100', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-科室维护-删除', '/deptInfo/deleteDeptInfo', 'ALL', 'ICSS数据维护-科室维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('101', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-科室维护-查询', '/deptInfo/getDeptInfo', 'ALL', 'ICSS数据维护-科室维护-查询', null);
+INSERT INTO `sys_permission` VALUES ('102', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-科室维护-详情', '/deptInfo/getDeptInfoDetials', 'ALL', 'ICSS数据维护-科室维护-详情', null);
+INSERT INTO `sys_permission` VALUES ('104', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-科室维护-添加', '/deptInfo/addDeptInfo', 'ALL', 'ICSS数据维护-科室维护-添加', null);
+INSERT INTO `sys_permission` VALUES ('105', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-新增|修改', '/retrieval/addTagRetrieval', 'ALL', 'ICSS数据维护-别名维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('106', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-详情', '/retrieval/getRetrievalsByTag', 'ALL', 'ICSS数据维护-别名维护-详情', null);
+INSERT INTO `sys_permission` VALUES ('107', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-删除', '/retrieval/delRetrievalsByQuesId', 'ALL', 'ICSS数据维护-别名维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('108', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-导入', '/retrieval/retrievalExcelIm', 'ALL', 'ICSS数据维护-别名维护-导入', null);
+INSERT INTO `sys_permission` VALUES ('109', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-列表', '/retrieval/retrievalList', 'ALL', 'ICSS数据维护-别名维护-列表', null);
+INSERT INTO `sys_permission` VALUES ('110', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-添加', '/moduleInfo/saveModuleInfo', 'ALL', 'ICSS数据维护-模板维护-添加', null);
+INSERT INTO `sys_permission` VALUES ('111', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-修改', '/moduleInfo/updateModuleInfo', 'ALL', 'ICSS数据维护-模板维护-修改', null);
+INSERT INTO `sys_permission` VALUES ('112', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-删除', '/moduleInfo/delete', 'ALL', 'ICSS数据维护-模板维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('113', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取标签池信息', '/moduleInfo/getQuestionInfos', 'ALL', 'ICSS数据维护-模板维护-获取标签池信息', null);
+INSERT INTO `sys_permission` VALUES ('114', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取子模板信息', '/moduleInfo/getModuleInfo', 'ALL', 'ICSS数据维护-模板维护-获取子模板信息', null);
+INSERT INTO `sys_permission` VALUES ('115', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取模板列表', '/moduleInfo/getModuleInfoList', 'ALL', 'ICSS数据维护-模板维护-获取模板列表', null);
+INSERT INTO `sys_permission` VALUES ('116', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取模板明细信息', '/moduleInfo/getModuleDetailInfo', 'ALL', 'ICSS数据维护-模板维护-获取模板明细信息', null);
+INSERT INTO `sys_permission` VALUES ('117', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取单个模板信息（修改用）', '/moduleInfo/getModuleInfoOne', 'ALL', 'ICSS数据维护-模板维护-获取单个模板信息（修改用）', null);
+INSERT INTO `sys_permission` VALUES ('118', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-添加和修改', '/questionUsual/addQuestionUsual', 'ALL', 'ICSS数据维护-常见症状维护-添加和修改', null);
+INSERT INTO `sys_permission` VALUES ('119', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-删除', '/questionUsual/deleteQuestionUsual', 'ALL', 'ICSS数据维护-常见症状维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('120', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-获取科室名称', '/questionUsual/getDeptName', 'ALL', 'ICSS数据维护-常见症状维护-获取科室名称', null);
+INSERT INTO `sys_permission` VALUES ('121', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-获取标签信息', '/questionUsual/getQuestionInfo', 'ALL', 'ICSS数据维护-常见症状维护-获取标签信息', null);
+INSERT INTO `sys_permission` VALUES ('122', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-根据科室获取常用标签信息(修改和详情用)', '/questionUsual/getQuestionUsualByDept', 'ALL', 'ICSS数据维护-常见症状维护-根据科室获取常用标签信息(修改和详情用)', null);
+INSERT INTO `sys_permission` VALUES ('123', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-常见症状维护-获取科室信息(常见症状维护系统页面查询)', '/questionUsual/getDeptInfos', 'ALL', 'ICSS数据维护-常见症状维护-获取科室信息(常见症状维护系统页面查询)', null);
+INSERT INTO `sys_permission` VALUES ('124', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-获取免责申明详情', '/disclaimerInformation/getDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-获取免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('125', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-增加免责申明详情', '/disclaimerInformation/addDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-增加免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('126', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-修改免责申明详情', '/disclaimerInformation/updateDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-修改免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('127', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-删除免责申明详情', '/disclaimerInformation/cancelDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-删除免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('128', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-启用免责申明详情', '/disclaimerInformation/startDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-启用免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('129', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-免责申明-停用免责申明详情', '/disclaimerInformation/endDisclaimerInformations', 'ALL', 'ICSS数据维护-免责申明-停用免责申明详情', null);
+INSERT INTO `sys_permission` VALUES ('130', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-获取版本信息', '/versionInfo/getVersionInfoAlls', 'ALL', '各版本信息维护-版本信息维护-获取版本信息', null);
+INSERT INTO `sys_permission` VALUES ('131', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-保存版本信息', '/versionInfo/saveVersionInfoAlls', 'ALL', '各版本信息维护-版本信息维护-保存版本信息', null);
+INSERT INTO `sys_permission` VALUES ('132', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-更新版本信息', '/versionInfo/updateVersionInfoAlls', 'ALL', '各版本信息维护-版本信息维护-更新版本信息', null);
+INSERT INTO `sys_permission` VALUES ('133', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-删除版本信息', '/versionInfo/cancelVersionInfoAlls', 'ALL', '各版本信息维护-版本信息维护-删除版本信息', null);
+INSERT INTO `sys_permission` VALUES ('134', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-更新版本详情信息', '/versionDetail/updateVersionDetails', 'ALL', '各版本信息维护-版本信息维护-更新版本详情信息', null);
+INSERT INTO `sys_permission` VALUES ('135', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-删除版本详情信息', '/versionDetail/cancelVersionDetails', 'ALL', '各版本信息维护-版本信息维护-删除版本详情信息', null);
+INSERT INTO `sys_permission` VALUES ('136', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-增加版本详情信息', '/versionDetail/addVersionDetails', 'ALL', '各版本信息维护-版本信息维护-增加版本详情信息', null);
+INSERT INTO `sys_permission` VALUES ('137', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-查体模板列表', '/deptVital/getDeptVitalPage', 'ALL', 'ICSS数据维护-查体模板维护-查体模板列表', null);
+INSERT INTO `sys_permission` VALUES ('138', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-保存', '/deptVital/saveDeptVitals', 'ALL', 'ICSS数据维护-查体模板维护-保存', null);
+INSERT INTO `sys_permission` VALUES ('139', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-根据科室删除', '/deptVital/delAllDeptVitalList', 'ALL', 'ICSS数据维护-查体模板维护-根据科室删除', null);
+INSERT INTO `sys_permission` VALUES ('140', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-获取未维护的科室（新增）', '/deptVital/getDeptShortList_create', 'ALL', 'ICSS数据维护-查体模板维护-获取未维护的科室（新增）', null);
+INSERT INTO `sys_permission` VALUES ('141', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-获取未维护的科室（修改）', '/deptVital/getDeptShortList_modify', 'ALL', 'ICSS数据维护-查体模板维护-获取未维护的科室（修改）', null);
+INSERT INTO `sys_permission` VALUES ('142', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-根据科室获取查体模板', '/deptVital/getModuleByDeptId', 'ALL', 'ICSS数据维护-查体模板维护-根据科室获取查体模板', null);
+INSERT INTO `sys_permission` VALUES ('161', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护-版本信息维护-根据版本id获取版本详情信息', '/versionDetail/getDetailById', 'ALL', '各版本信息维护-版本信息维护-根据版本id获取版本详情信息', null);
+INSERT INTO `sys_permission` VALUES ('162', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-获取所有医学术语命名', '/concept/getAllConcept', 'ALL', '医学术语库维护-医学术语命名维护-获取所有医学术语命名', null);
+INSERT INTO `sys_permission` VALUES ('163', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-获取医学术语命名列表', '/concept/getAllInformation', 'ALL', '医学术语库维护-医学术语命名维护-获取医学术语命名列表', null);
+INSERT INTO `sys_permission` VALUES ('164', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-医学术语命名删除', '/concept/removeConceptInfo', 'ALL', '医学术语库维护-医学术语命名维护-医学术语命名删除', null);
+INSERT INTO `sys_permission` VALUES ('165', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-获取医学术语命名详情', '/concept/getConceptInfoDetail', 'ALL', '医学术语库维护-医学术语命名维护-获取医学术语命名详情', null);
+INSERT INTO `sys_permission` VALUES ('166', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-获取术语医学属性列表', '/medical/getMedicalInfoList', 'ALL', '医学术语库维护-术语医学属性维护-获取术语医学属性列表', null);
+INSERT INTO `sys_permission` VALUES ('167', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-获取术语医学属性详情', '/medical/getMedicalInfoDetail', 'ALL', '医学术语库维护-术语医学属性维护-获取术语医学属性详情', null);
+INSERT INTO `sys_permission` VALUES ('168', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-术语医学属性添加或者编辑', '/medical/addMedicalInfo', 'ALL', '医学术语库维护-术语医学属性维护-术语医学属性添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('169', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-术语医学属性删除', '/medical/removeMedicalInfo', 'ALL', '医学术语库维护-术语医学属性维护-术语医学属性删除', null);
+INSERT INTO `sys_permission` VALUES ('170', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-获取医学术语关系列表', '/relation/getRelationInfoList', 'ALL', '医学术语库维护-医学术语关系维护-获取医学术语关系列表', null);
+INSERT INTO `sys_permission` VALUES ('171', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-医学术语关系删除', '/relation/removeRelationInfo', 'ALL', '医学术语库维护-医学术语关系维护-医学术语关系删除', null);
+INSERT INTO `sys_permission` VALUES ('172', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-获取医学术语关系详情', '/relation/getRelationInfoDetail', 'ALL', '医学术语库维护-医学术语关系维护-获取医学术语关系详情', null);
+INSERT INTO `sys_permission` VALUES ('173', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识列表', '/conceptDetail//page', 'ALL', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识列表', null);
+INSERT INTO `sys_permission` VALUES ('174', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语静态知识维护-医学术语静态知识删除', '/conceptDetail/delete', 'ALL', '医学术语库维护-医学术语静态知识维护-医学术语静态知识删除', null);
+INSERT INTO `sys_permission` VALUES ('175', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识详情', '/conceptDetail/getByConceptId', 'ALL', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识详情', null);
+INSERT INTO `sys_permission` VALUES ('176', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语静态知识维护-医学术语静态知识添加或者编辑', '/conceptDetail/insertOrUpdate', 'ALL', '医学术语库维护-医学术语静态知识维护-医学术语静态知识添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('177', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-别名维护-标签搜索', '/questionInfo/indexRev', 'ALL', 'ICSS数据维护-别名维护-标签搜索', null);
+INSERT INTO `sys_permission` VALUES ('178', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-化验大小项与公表项对应维护-分页列表', '/lisMapping/getLisMappingPage', 'ALL', 'ICSS数据维护-化验大小项与公表项对应维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('179', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-化验大小项与公表项对应维护-保存', '/lisMapping/saveLisMapping', 'ALL', 'ICSS数据维护-化验大小项与公表项对应维护-新增', null);
+INSERT INTO `sys_permission` VALUES ('180', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-化验大小项与公表项对应维护-是否已存在', '/lisMapping/hasLisMapping', 'ALL', 'ICSS数据维护-化验大小项与公表项对应维护-修改', null);
+INSERT INTO `sys_permission` VALUES ('181', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-化验大小项与公表项对应维护-删除(单条)', '/lisMapping/delLisMappingById', 'ALL', 'ICSS数据维护-化验大小项与公表项对应维护-删除(单条)', null);
+INSERT INTO `sys_permission` VALUES ('182', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-化验大小项与公表项对应维护-删除(批量)', '/lisMapping/delLisMappingByIds', 'ALL', 'ICSS数据维护-化验大小项与公表项对应维护-删除(批量)', null);
+INSERT INTO `sys_permission` VALUES ('183', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-获取模板type', '/moduleInfo/getModuleType', 'ALL', 'ICSS数据维护-获取模板type', null);
+INSERT INTO `sys_permission` VALUES ('184', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-分页模糊查询标签组维护接口', '/evaluation/queryEvaluationModulePages', 'ALL', 'ICSS数据维护-慢病评估维护-分页模糊查询标签组维护接口', null);
+INSERT INTO `sys_permission` VALUES ('185', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-获取慢病标签组维护', '/evaluation/getEvaluationModuleLists', 'ALL', 'ICSS数据维护-慢病评估维护-获取慢病标签组维护', null);
+INSERT INTO `sys_permission` VALUES ('186', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-慢病评估维护——修改管理评估', '/evaluation/updateEvaluationModuleLists', 'ALL', 'ICSS数据维护-慢病评估维护-慢病评估维护——修改管理评估', null);
+INSERT INTO `sys_permission` VALUES ('187', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-慢病评估维护——添加管理评估', '/evaluation/saveEvaluationModuleLists', 'ALL', 'ICSS数据维护-慢病评估维护-慢病评估维护——添加管理评估', null);
+INSERT INTO `sys_permission` VALUES ('188', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-删除慢病标签组维护', '/evaluation/cancelEvaluationModuleAlls', 'ALL', 'ICSS数据维护-慢病评估维护-删除慢病标签组维护', null);
+INSERT INTO `sys_permission` VALUES ('189', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-分页模糊查询慢病指标值关联维护', '/indexConfig/queryIndexConfigPages', 'ALL', 'ICSS数据维护-慢病指标值关联维护-分页模糊查询慢病指标值关联维护', null);
+INSERT INTO `sys_permission` VALUES ('190', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-获取慢病指标值关联维护', '/indexConfig/getIndexConfigLists', 'ALL', 'ICSS数据维护-慢病指标值关联维护-获取慢病指标值关联维护', null);
+INSERT INTO `sys_permission` VALUES ('191', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——修改关联', '/indexConfig/updateIndexConfigList', 'ALL', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——修改关联', null);
+INSERT INTO `sys_permission` VALUES ('192', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——添加关联', '/indexConfig/saveIndexConfigLists', 'ALL', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——添加关联', null);
+INSERT INTO `sys_permission` VALUES ('193', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-删除慢病指标值关联维护', '/indexConfig/cancelIndexConfigAlls', 'ALL', 'ICSS数据维护-慢病指标值关联维护-删除慢病指标值关联维护', null);
+INSERT INTO `sys_permission` VALUES ('198', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-获取特殊标签（同伴|无）', '/questionInfo/getSpecial', 'ALL', 'ICSS数据维护-独立标签维护-获取特殊标签（同伴|无）', null);
+INSERT INTO `sys_permission` VALUES ('199', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-根据id返回内容', '/questionInfo/getById', 'ALL', 'ICSS数据维护-独立标签维护-根据id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('200', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-根据多个id返回内容', '/questionInfo/getByIds', 'ALL', 'ICSS数据维护-独立标签维护-根据多个id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('201', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-独立标签维护-检索', '/questionInfo/index', 'ALL', 'ICSS数据维护-独立标签维护-检索', null);
+INSERT INTO `sys_permission` VALUES ('209', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-术语医学属性excel文件导入', '/medical/medicalInfoExcelIm', 'ALL', '医学术语库维护-术语医学属性维护-术语医学属性excel文件导入', null);
+INSERT INTO `sys_permission` VALUES ('210', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-医学术语关系添加或者编辑', '/relation/addRelationInfo', 'ALL', '医学术语库维护-医学术语关系维护-医学术语关系添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('211', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-医学术语关系excel文件导入', '/relation/relationInfoExcelIm', 'ALL', '医学术语库维护-医学术语关系维护-医学术语关系excel文件导入', null);
+INSERT INTO `sys_permission` VALUES ('213', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-医学术语命名添加或者编辑', '/concept/addConceptInfo', 'ALL', '医学术语库维护-医学术语命名维护-医学术语命名添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('214', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-医学术语命名excel文件导入', '/concept/conceptInfoExcelIm', 'ALL', '医学术语库维护-医学术语命名维护-医学术语命名excel文件导入', null);
+INSERT INTO `sys_permission` VALUES ('215', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语类型维护-获取所有术语类型', '/lexicon/getAllLexicon', 'ALL', '医学术语库维护-医学术语类型维护-获取所有术语类型', null);
+INSERT INTO `sys_permission` VALUES ('216', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语类型维护-获取术语类型列表', '/lexicon/getLexiconList', 'ALL', '医学术语库维护-医学术语类型维护-获取术语类型列表', null);
+INSERT INTO `sys_permission` VALUES ('217', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语类型维护-术语类型添加', '/lexicon/addLexicon', 'ALL', '医学术语库维护-医学术语类型维护-术语类型添加', null);
+INSERT INTO `sys_permission` VALUES ('218', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关系维护-获取所有关系类型', '/lexiconRelationship/getAllLexiconRelationship', 'ALL', '医学术语库维护-医学术语关系维护-获取所有关系类型', null);
+INSERT INTO `sys_permission` VALUES ('219', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-获取所有部位', '/bodypart/getAllBodypart', 'ALL', '医学术语库维护-术语医学属性维护-获取所有部位', null);
+INSERT INTO `sys_permission` VALUES ('220', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-术语医学属性维护-获取术语医学属性所需全部科室', '/medical/getAllDepts', 'ALL', '医学术语库维护-术语医学属性维护-获取术语医学属性所需全部科室', null);
+INSERT INTO `sys_permission` VALUES ('221', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-量表结构维护-新增|修改', '/scaleContent/insertOrUpdate', 'ALL', '医学术语库维护-量表结构维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('222', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-量表结构维护-分页列表', '/scaleContent/page', 'ALL', '医学术语库维护-量表结构维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('223', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-获取所有化验公表项', '/concept/getAllLisConcept', 'ALL', '医学术语库维护-医学术语命名维护-获取所有化验公表项', null);
+INSERT INTO `sys_permission` VALUES ('224', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-量表结构维护-删除|恢复', '/scaleContent/delete', 'ALL', '医学术语库维护-量表结构维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('225', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-量表结构维护-根据id返回内容', '/scaleContent/getByConceptId', 'ALL', '医学术语库维护-量表结构维护-根据id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('227', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-量表结构维护-检索', '/scaleContent/index', 'ALL', '医学术语库维护-量表结构维护-检索', null);
+INSERT INTO `sys_permission` VALUES ('228', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-获取所有科室和疾病信息', '/moduleInfo/getAllDeptAndDisInfo', 'ALL', 'ICSS数据维护-获取所有科室和疾病信息', null);
+INSERT INTO `sys_permission` VALUES ('229', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病指标值关联维护-慢病指标疾病标签查询', '/indexConfig/queryIndexConfigDiseaseNames', 'ALL', 'ICSS数据维护-慢病指标值关联维护-慢病指标疾病标签查询', null);
+INSERT INTO `sys_permission` VALUES ('230', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-慢病评估维护-慢病疾病标签查询', '/evaluation/queryEvaluationDiseaseNames', 'ALL', 'ICSS数据维护-慢病评估维护-慢病疾病标签查询', null);
+INSERT INTO `sys_permission` VALUES ('231', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-标签组维护-子标签检索', '/questionInfo/indexSub', 'ALL', 'ICSS数据维护-标签组维护-子标签检索', null);
+INSERT INTO `sys_permission` VALUES ('232', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-模板维护-获取标签和模板关联信息（删除标签时校验用）', '/moduleInfo/getQuestiongAndModuleRelations', 'ALL', 'ICSS数据维护-模板维护-获取标签和模板关联信息（删除标签时校验用）', null);
+INSERT INTO `sys_permission` VALUES ('233', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 'ICSS数据维护-查体模板维护-查询科室下拉列表(查询页面)', '/deptVital/getDeptShortList_Searh', 'ALL', 'ICSS数据维护-查体模板维护-查询科室下拉列表(查询页面)', null);
+INSERT INTO `sys_permission` VALUES ('234', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语命名维护-获取所有概念(术语关系维护时筛选使用)', '/concept/getAllForRelation', 'ALL', '医学术语库维护-医学术语命名维护-获取所有概念(术语关系维护时筛选使用)', null);
+INSERT INTO `sys_permission` VALUES ('235', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-化验子项维护-列表', '/lisSonContact/lisSonContactList', 'ALL', '医学术语库维护-化验子项维护-列表', null);
+INSERT INTO `sys_permission` VALUES ('236', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-化验子项维护-添加或者编辑', '/lisSonContact/addRelation', 'ALL', '医学术语库维护-化验子项维护-添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('237', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-化验子项维护-详情', '/lisSonContact/relationContactDetail', 'ALL', '医学术语库维护-化验子项维护-详情', null);
+INSERT INTO `sys_permission` VALUES ('238', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-化验子项维护-删除或者恢复', '/lisSonContact/removeRelationContact', 'ALL', '医学术语库维护-化验子项维护-删除或者恢复', null);
+INSERT INTO `sys_permission` VALUES ('239', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关联维护-列表', '/relationContact/relationContactList', 'ALL', '医学术语库维护-医学术语关联维护-列表', null);
+INSERT INTO `sys_permission` VALUES ('240', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关联维护-添加或者编辑', '/relationContact/addRelation', 'ALL', '医学术语库维护-医学术语关联维护-添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('241', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关联维护-详情', '/relationContact/relationContactDetail', 'ALL', '医学术语库维护-医学术语关联维护-详情', null);
+INSERT INTO `sys_permission` VALUES ('242', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语关联维护-删除或者恢复', '/relationContact/removeRelationContact', 'ALL', '医学术语库维护-医学术语关联维护-删除或者恢复', null);
+INSERT INTO `sys_permission` VALUES ('243', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语多层关联维护-列表', '/multContact/multContactList', 'ALL', '医学术语库维护-医学术语多层关联维护-列表', null);
+INSERT INTO `sys_permission` VALUES ('244', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语多层关联维护-添加或者编辑', '/multContact/addRelation', 'ALL', '医学术语库维护-医学术语多层关联维护-添加或者编辑', null);
+INSERT INTO `sys_permission` VALUES ('245', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语多层关联维护-详情', '/multContact/relationContactDetail', 'ALL', '医学术语库维护-医学术语多层关联维护-详情', null);
+INSERT INTO `sys_permission` VALUES ('246', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语多层关联维护-删除或者恢复', '/multContact/removeRelationContact', 'ALL', '医学术语库维护-医学术语多层关联维护-删除或者恢复', null);
+INSERT INTO `sys_permission` VALUES ('247', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护-医学术语静态知识维护-内容检索', '/conceptDetail/index', 'ALL', '医学术语库维护-医学术语静态知识维护-内容检索', null);
+INSERT INTO `sys_permission` VALUES ('248', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-新增|修改', '/questionInfo_prec/saveOrUpdate', 'ALL', '预问诊数据维护-标签组维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('249', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-删除', '/questionInfo_prec/delete', 'ALL', '预问诊数据维护-标签组维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('250', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-分页列表', '/questionInfo_prec/page', 'ALL', '预问诊数据维护-标签组维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('251', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-检索', '/questionInfo_prec/index', 'ALL', '预问诊数据维护-标签组维护-检索', null);
+INSERT INTO `sys_permission` VALUES ('252', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-根据id返回内容', '/questionInfo_prec/getById', 'ALL', '预问诊数据维护-标签组维护-根据id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('253', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-标签组维护-根据多个id返回内容', '/questionInfo_prec/getByIds', 'ALL', '预问诊数据维护-标签组维护-根据多个id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('254', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-新增|修改', '/questionInfo_prec/saveOrUpdate', 'ALL', '预问诊数据维护-独立填写单维护-新增|修改', null);
+INSERT INTO `sys_permission` VALUES ('255', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-删除', '/questionInfo_prec/delete', 'ALL', '预问诊数据维护-独立填写单维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('256', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-分页列表', '/questionInfo_prec/page', 'ALL', '预问诊数据维护-独立填写单维护-分页列表', null);
+INSERT INTO `sys_permission` VALUES ('257', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-检索', '/questionInfo_prec/index', 'ALL', '预问诊数据维护-独立填写单维护-检索', null);
+INSERT INTO `sys_permission` VALUES ('258', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-根据id返回内容', '/questionInfo_prec/getById', 'ALL', '预问诊数据维护-独立填写单维护-根据id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('259', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-独立填写单维护-根据多个id返回内容', '/questionInfo_prec/getByIds', 'ALL', '预问诊数据维护-独立填写单维护-根据多个id返回内容', null);
+INSERT INTO `sys_permission` VALUES ('260', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-模板新增', '/moduleInfo_prec/saveOrUpdateModuleInfo', 'ALL', '预问诊数据维护-模板维护-模板新增', null);
+INSERT INTO `sys_permission` VALUES ('262', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-模板删除', '/moduleInfo_prec/delete', 'ALL', '预问诊数据维护-模板维护-模板删除', null);
+INSERT INTO `sys_permission` VALUES ('263', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-获取模板列表', '/moduleInfo_prec/getModuleInfoList', 'ALL', '预问诊数据维护-模板维护-获取模板列表', null);
+INSERT INTO `sys_permission` VALUES ('264', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-修改时获取已经添加过的标签', '/moduleInfo_prec/getModuleDetailInfo', 'ALL', '预问诊数据维护-模板维护-修改时获取已经添加过的标签', null);
+INSERT INTO `sys_permission` VALUES ('265', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-获取单个模板(修改用)', '/moduleInfo_prec/getModuleInfoOne', 'ALL', '预问诊数据维护-模板维护-获取单个模板(修改用)', null);
+INSERT INTO `sys_permission` VALUES ('266', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-获取模板类型(修改时取类型)', '/moduleInfo_prec/getModuleType', 'ALL', '预问诊数据维护-模板维护-获取模板类型(修改时取类型)', null);
+INSERT INTO `sys_permission` VALUES ('267', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-获取所有科室信息(主页下拉用)', '/moduleInfo_prec/getAllDeptAndDisInfo', 'ALL', '预问诊数据维护-模板维护-获取所有科室信息(主页下拉用)', null);
+INSERT INTO `sys_permission` VALUES ('268', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护-模板维护-获取标签和模板关联信息', '/moduleInfo_prec/getQuestiongAndModuleRelations', 'ALL', '预问诊数据维护-模板维护-获取标签和模板关联信息', null);
+INSERT INTO `sys_permission` VALUES ('269', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-导出诊断依据问题词', '/diagnose/exportDiagnosticBasis', 'ALL', '诊断依据维护-导出诊断依据问题词', null);
+INSERT INTO `sys_permission` VALUES ('270', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-导出诊断依据', '/diagnose/exportDiagnosticAll', 'ALL', '诊断依据维护-导出诊断依据', null);
+INSERT INTO `sys_permission` VALUES ('271', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据问题词数据维护-分页查询', '/diagnoseQuestion/queryQuestionPage', 'ALL', '诊断依据维护-诊断依据问题词数据维护-分页查询', null);
+INSERT INTO `sys_permission` VALUES ('272', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-分页', '/diagnose/page', 'ALL', '诊断依据维护-诊断依据数据维护-分页', null);
+INSERT INTO `sys_permission` VALUES ('273', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-删除', '/diagnose/delete', 'ALL', '诊断依据维护-诊断依据数据维护-删除', null);
+INSERT INTO `sys_permission` VALUES ('274', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-诊断检索', '/diagnose/index', 'ALL', '诊断依据维护-诊断依据数据维护-诊断检索', null);
+INSERT INTO `sys_permission` VALUES ('275', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-校验数据', '/diagnose/verifyData', 'ALL', '诊断依据维护-诊断依据数据维护-校验数据', null);
+INSERT INTO `sys_permission` VALUES ('276', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-校验所有数据', '/diagnose/verifyAllData', 'ALL', '诊断依据维护-诊断依据数据维护-校验所有数据', null);
+INSERT INTO `sys_permission` VALUES ('277', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-更新图谱', '/diagnose/updateNeo', 'ALL', '诊断依据维护-诊断依据数据维护-更新图谱', null);
+INSERT INTO `sys_permission` VALUES ('278', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护-诊断依据数据维护-获取详情', '/diagnose/getDetail', 'ALL', '诊断依据维护-诊断依据数据维护-获取详情', null);
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '角色名称',
+  `roleLevel` int(11) NOT NULL DEFAULT '0' COMMENT '角色等级',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述',
+  `menuItems` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单ID：对应角色ID',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='系统角色表';
+
+-- ----------------------------
+-- Records of sys_role
+-- ----------------------------
+INSERT INTO `sys_role` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '普通用户', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '管理员', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学数据维护人员', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护人员', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '预问诊数据维护', '0', '', '', null);
+INSERT INTO `sys_role` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断依据维护', '0', '', '', null);
+INSERT INTO `sys_role` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各版本信息维护人员', '0', '', '', null);
+INSERT INTO `sys_role` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '注册用户查询', '0', '', '', null);
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE `sys_role_menu` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '角色id',
+  `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8 COMMENT='角色和菜单的映射表';
+
+-- ----------------------------
+-- Records of sys_role_menu
+-- ----------------------------
+INSERT INTO `sys_role_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '1', '用户-控制台');
+INSERT INTO `sys_role_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '2', '用户-更多服务');
+INSERT INTO `sys_role_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '3', '用户-机构中心');
+INSERT INTO `sys_role_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '4', '用户-机构中心-账号信息');
+INSERT INTO `sys_role_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '5', '用户-机构中心-已开通产品');
+INSERT INTO `sys_role_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '6', '用户-机构中心-安全设置');
+INSERT INTO `sys_role_menu` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '用户-机构中心-管理服务端');
+INSERT INTO `sys_role_menu` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '14', '用户-机构中心-已生成令牌');
+INSERT INTO `sys_role_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '10', '朗通-客户中心');
+INSERT INTO `sys_role_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '11', '朗通-客户中心-机构信息');
+INSERT INTO `sys_role_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '12', '朗通-控制台');
+INSERT INTO `sys_role_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '15', '朗通-客户中心-注册用户');
+INSERT INTO `sys_role_menu` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '16', '朗通-客户中心-审核超管信息');
+INSERT INTO `sys_role_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '17', '朗通-订单系统');
+INSERT INTO `sys_role_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '18', '朗通-订单系统-产品线申请列表');
+INSERT INTO `sys_role_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '19', '朗通-产品线管理');
+INSERT INTO `sys_role_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '20', '朗通-个人中心');
+INSERT INTO `sys_role_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '21', '朗通-客户中心-已认证超管信息');
+INSERT INTO `sys_role_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '22', '朗通-订单系统-产品续费列表');
+INSERT INTO `sys_role_menu` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '23', '朗通-ICSS数据维护');
+INSERT INTO `sys_role_menu` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '24', '朗通-ICSS数据维护-标签组维护');
+INSERT INTO `sys_role_menu` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '25', '朗通-ICSS数据维护-独立类型标签维护');
+INSERT INTO `sys_role_menu` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '27', '朗通-ICSS数据维护-别名维护');
+INSERT INTO `sys_role_menu` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '28', '朗通-ICSS数据维护-模版维护');
+INSERT INTO `sys_role_menu` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '29', '朗通-ICSS数据维护-查体模版维护');
+INSERT INTO `sys_role_menu` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '30', '朗通-ICSS数据维护-icss科室维护');
+INSERT INTO `sys_role_menu` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '31', '朗通-ICSS数据维护-常见选项维护');
+INSERT INTO `sys_role_menu` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '32', '朗通-ICSS数据维护-提示信息维护');
+INSERT INTO `sys_role_menu` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '33', '朗通-ICSS数据维护-免责声明维护');
+INSERT INTO `sys_role_menu` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '34', '朗通-各版本信息维护-版本信息维护');
+INSERT INTO `sys_role_menu` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '35', '朗通-ICSS数据维护-查体模板维护');
+INSERT INTO `sys_role_menu` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '38', '朗通-医学术语库维护');
+INSERT INTO `sys_role_menu` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '39', '朗通-医学术语库维护-医学术语命名维护');
+INSERT INTO `sys_role_menu` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '40', '朗通-医学术语库维护-术语医学属性维护');
+INSERT INTO `sys_role_menu` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '41', '朗通-医学术语库维护-医学术语关系维护');
+INSERT INTO `sys_role_menu` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '42', '朗通-医学术语库维护-医学术语静态知识维护');
+INSERT INTO `sys_role_menu` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '43', '朗通-ICSS数据维护-化验大小项与公表项对应维护');
+INSERT INTO `sys_role_menu` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '44', '朗通-ICSS数据维护-慢病管理与评估维护');
+INSERT INTO `sys_role_menu` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '45', '朗通-ICSS数据维护-慢病指标值关联维护');
+INSERT INTO `sys_role_menu` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '48', '朗通-医学术语库维护-量表结构维护');
+INSERT INTO `sys_role_menu` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '49', '朗通-医学术语库维护-医学术语类型维护');
+INSERT INTO `sys_role_menu` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '51', '朗通-医学术语库维护-医学术语关联维护');
+INSERT INTO `sys_role_menu` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '52', '朗通-医学术语库维护-医学术语多层关联维护');
+INSERT INTO `sys_role_menu` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '50', '朗通-医学术语库维护-化验子项维护');
+INSERT INTO `sys_role_menu` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '53', '朗通-预问诊数据维护');
+INSERT INTO `sys_role_menu` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '54', '朗通-预问诊数据维护-独立填写单维护');
+INSERT INTO `sys_role_menu` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '55', '朗通-预问诊数据维护-组合填写单维护');
+INSERT INTO `sys_role_menu` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '56', '朗通-预问诊数据维护-模版维护');
+INSERT INTO `sys_role_menu` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '57', '朗通-诊断依据维护');
+INSERT INTO `sys_role_menu` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '58', '朗通-诊断依据维护-诊断依据数据维护');
+INSERT INTO `sys_role_menu` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '59', '朗通-诊断依据维护-问题词数据维护');
+INSERT INTO `sys_role_menu` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '60', '朗通-各版本信息维护-版本信息维护');
+INSERT INTO `sys_role_menu` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '10', '朗通-客户中心');
+INSERT INTO `sys_role_menu` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '15', '朗通-客户中心-注册用户');
+
+-- ----------------------------
+-- Table structure for sys_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_permission`;
+CREATE TABLE `sys_role_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '角色id',
+  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '资源id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=299 DEFAULT CHARSET=utf8 COMMENT='角色和资源的映射表';
+
+-- ----------------------------
+-- Records of sys_role_permission
+-- ----------------------------
+INSERT INTO `sys_role_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '15', '用户-机构中心-已开通产品-关联产品与用户服务端');
+INSERT INTO `sys_role_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '16', '用户-机构中心-已开通产品-删除产品与用户服务端的关联');
+INSERT INTO `sys_role_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '17', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表');
+INSERT INTO `sys_role_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '24', '用户-机构中心-管理服务端-新增服务端');
+INSERT INTO `sys_role_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '25', '用户-机构中心-管理服务端-修改服务端');
+INSERT INTO `sys_role_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '26', '用户-机构中心-管理服务端-获取当前登录用户的服务列表');
+INSERT INTO `sys_role_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '27', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表');
+INSERT INTO `sys_role_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '用户-机构中心-账户信息-获取当前用户信息');
+INSERT INTO `sys_role_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '10', '用户-机构中心-账户信息-用户认证');
+INSERT INTO `sys_role_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '11', '用户-机构中心-账户信息-获取当前用户认证状态');
+INSERT INTO `sys_role_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '33', '用户-机构中心-已经生成令牌-生成令牌');
+INSERT INTO `sys_role_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '34', '用户-机构中心-已经生成令牌-禁用令牌');
+INSERT INTO `sys_role_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '35', '用户-机构中心-已经生成令牌-启用令牌');
+INSERT INTO `sys_role_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '36', '用户-机构中心-已经生成令牌-删除令牌');
+INSERT INTO `sys_role_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '39', '用户-控制台-账号认证进度');
+INSERT INTO `sys_role_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '40', '用户-控制台-产品认证进度');
+INSERT INTO `sys_role_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', '用户-控制台-已开通产品');
+INSERT INTO `sys_role_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', '用户-控制台-可试用产品');
+INSERT INTO `sys_role_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '43', '用户-控制台-产品立即试用接口');
+INSERT INTO `sys_role_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '44', '用户-控制台-可展示的选项卡');
+INSERT INTO `sys_role_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '用户-控制台-账户信息');
+INSERT INTO `sys_role_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '51', '用户-更多服务-显示产品');
+INSERT INTO `sys_role_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '52', '用户-更多服务-开通产品');
+INSERT INTO `sys_role_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '8', '朗通-客户中心-获取用户信息列表');
+INSERT INTO `sys_role_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '12', '朗通-客户中心-修改用户和机构信息');
+INSERT INTO `sys_role_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '14', '朗通-客户中心-根据用户Id删除');
+INSERT INTO `sys_role_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '18', '朗通-客户中心-模糊查询机构信息');
+INSERT INTO `sys_role_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '19', '朗通-客户中心-添加机构信息');
+INSERT INTO `sys_role_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '20', '朗通-客户中心-添加用户信息和绑定机构');
+INSERT INTO `sys_role_permission` VALUES ('55', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '22', '朗通-客户中心-审核用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '31', '朗通-客户中心-根据用户id和产品id，修改开通时间');
+INSERT INTO `sys_role_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '28', '朗通-客户中心-根据用户id查询已开通的功能');
+INSERT INTO `sys_role_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '29', '朗通-客户中心-根据用户id和产品id，启用和停用功能');
+INSERT INTO `sys_role_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '30', '朗通-客户中心-根据用户id和产品id，删除开通信息');
+INSERT INTO `sys_role_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '32', '朗通-客户中心-根据时间导出用户和机构信息');
+INSERT INTO `sys_role_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '37', '朗通-控制台-待审核订单个数');
+INSERT INTO `sys_role_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '38', '朗通-控制台-待认证账号数量');
+INSERT INTO `sys_role_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '46', '朗通-客户中心-查询所有用户已开通的功能');
+INSERT INTO `sys_role_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '47', '朗通-客户中心-查询用户信息和机构信息开通产品');
+INSERT INTO `sys_role_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '48', '朗通-个人中心-修改密码');
+INSERT INTO `sys_role_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '53', '朗通-产品线管理-添加产品');
+INSERT INTO `sys_role_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '21', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表');
+INSERT INTO `sys_role_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '54', '用户-机构中心-管理服务端-删除服务端');
+INSERT INTO `sys_role_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '55', '朗通-产品线管理-查询');
+INSERT INTO `sys_role_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '56', '朗通-产品线管理-修改');
+INSERT INTO `sys_role_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '57', '朗通-产品线管理-(启用/禁用)');
+INSERT INTO `sys_role_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '58', '朗通-产品线管理-删除');
+INSERT INTO `sys_role_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '59', '朗通-产品线管理-详情');
+INSERT INTO `sys_role_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '60', '朗通-产品申请-显示所有订单明细');
+INSERT INTO `sys_role_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '61', '朗通-产品申请-审核');
+INSERT INTO `sys_role_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '62', '朗通-产品申请-显示所有订单');
+INSERT INTO `sys_role_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '63', '用户-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '64', '朗通-客户中心-分页查询注册用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '65', '朗通-客户中心-分页查询机构信息接口');
+INSERT INTO `sys_role_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '66', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口');
+INSERT INTO `sys_role_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '67', '朗通-客户中心-分页查询认证中的用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '68', '导出产品申请相关信息');
+INSERT INTO `sys_role_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '69', '朗通-个人中心-获取个人信息');
+INSERT INTO `sys_role_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '70', '朗通-个人中心-修改个人信息');
+INSERT INTO `sys_role_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '71', '客户中心-导出用户信息');
+INSERT INTO `sys_role_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '72', '客户中心-导出机构信息');
+INSERT INTO `sys_role_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '73', '客户中心-导出认证中用户的信息:');
+INSERT INTO `sys_role_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '74', '客户中心-导出已认证用户的信息');
+INSERT INTO `sys_role_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '75', '用户更多服务-产品续费');
+INSERT INTO `sys_role_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '76', '客户中心-超管修改用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '77', '客户中心-超管修改机构信息接口');
+INSERT INTO `sys_role_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '78', '续费管理-显示');
+INSERT INTO `sys_role_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '79', '用户-机构中心-已经生成令牌-获取令牌');
+INSERT INTO `sys_role_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '80', '续费管理-显示');
+INSERT INTO `sys_role_permission` VALUES ('99', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '81', '续费管理-续费');
+INSERT INTO `sys_role_permission` VALUES ('100', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '82', '续费管理-取消续费');
+INSERT INTO `sys_role_permission` VALUES ('101', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '83', '客户中心-认证用户信息和机构信息不通过接口(新)');
+INSERT INTO `sys_role_permission` VALUES ('102', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '84', '客户中心-认证用户信息和机构信息通过接口(新)');
+INSERT INTO `sys_role_permission` VALUES ('103', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '87', '客户中心-已开通产品状态校验');
+INSERT INTO `sys_role_permission` VALUES ('104', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '88', 'ICSS数据维护-独立标签维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('105', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '89', 'ICSS数据维护-独立标签维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('106', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '90', 'ICSS数据维护-独立标签维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('107', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '91', 'ICSS数据维护-标签组维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('108', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '92', 'ICSS数据维护-标签组维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('109', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '93', 'ICSS数据维护-标签组维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('110', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '94', 'ICSS数据维护-标签组维护-获取特殊标签（同伴|无）');
+INSERT INTO `sys_role_permission` VALUES ('111', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '95', 'ICSS数据维护-标签组维护-根据id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('112', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '96', 'ICSS数据维护-标签组维护-根据多个id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('113', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '98', 'ICSS数据维护-标签组维护-检索');
+INSERT INTO `sys_role_permission` VALUES ('114', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '99', 'ICSS数据维护-科室维护-修改');
+INSERT INTO `sys_role_permission` VALUES ('115', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '100', 'ICSS数据维护-科室维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('116', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '101', 'ICSS数据维护-科室维护-查询');
+INSERT INTO `sys_role_permission` VALUES ('117', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '102', 'ICSS数据维护-科室维护-详情');
+INSERT INTO `sys_role_permission` VALUES ('119', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '104', 'ICSS数据维护-科室维护-添加');
+INSERT INTO `sys_role_permission` VALUES ('120', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '105', 'ICSS数据维护-别名维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('121', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '106', 'ICSS数据维护-别名维护-详情');
+INSERT INTO `sys_role_permission` VALUES ('122', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '107', 'ICSS数据维护-别名维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('123', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '108', 'ICSS数据维护-别名维护-导入');
+INSERT INTO `sys_role_permission` VALUES ('124', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '109', 'ICSS数据维护-别名维护-列表');
+INSERT INTO `sys_role_permission` VALUES ('125', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '110', 'ICSS数据维护-模板维护-添加');
+INSERT INTO `sys_role_permission` VALUES ('126', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '111', 'ICSS数据维护-模板维护-修改');
+INSERT INTO `sys_role_permission` VALUES ('127', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '112', 'ICSS数据维护-模板维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('128', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '113', 'ICSS数据维护-模板维护-获取标签池信息');
+INSERT INTO `sys_role_permission` VALUES ('129', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '114', 'ICSS数据维护-模板维护-获取子模板信息');
+INSERT INTO `sys_role_permission` VALUES ('130', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '115', 'ICSS数据维护-模板维护-获取模板列表');
+INSERT INTO `sys_role_permission` VALUES ('131', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '116', 'ICSS数据维护-模板维护-获取模板明细信息');
+INSERT INTO `sys_role_permission` VALUES ('132', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '117', 'ICSS数据维护-模板维护-获取单个模板信息（修改用）');
+INSERT INTO `sys_role_permission` VALUES ('133', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '118', 'ICSS数据维护-常用选项维护-添加和修改');
+INSERT INTO `sys_role_permission` VALUES ('134', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '119', 'ICSS数据维护-常用选项维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('135', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '120', 'ICSS数据维护-常用选项维护-获取科室名称');
+INSERT INTO `sys_role_permission` VALUES ('136', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '121', 'ICSS数据维护-常用选项维护-获取标签信息');
+INSERT INTO `sys_role_permission` VALUES ('137', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '122', 'ICSS数据维护-常用选项维护-根据科室获取常用标签信息(修改和详情用)');
+INSERT INTO `sys_role_permission` VALUES ('138', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '123', 'ICSS数据维护-常用选项维护-获取科室信息(常见症状维护系统页面查询)');
+INSERT INTO `sys_role_permission` VALUES ('139', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '124', 'ICSS数据维护-免责申明-获取免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('140', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '125', 'ICSS数据维护-免责申明-增加免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('141', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '126', 'ICSS数据维护-免责申明-修改免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('142', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '127', 'ICSS数据维护-免责申明-删除免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('143', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '128', 'ICSS数据维护-免责申明-启用免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('144', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '129', 'ICSS数据维护-免责申明-停用免责申明详情');
+INSERT INTO `sys_role_permission` VALUES ('145', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '130', '各版本信息维护-版本信息维护-获取版本信息');
+INSERT INTO `sys_role_permission` VALUES ('146', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '131', '各版本信息维护-版本信息维护-保存版本信息');
+INSERT INTO `sys_role_permission` VALUES ('147', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '132', '各版本信息维护-版本信息维护-更新版本信息');
+INSERT INTO `sys_role_permission` VALUES ('148', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '133', '各版本信息维护-版本信息维护-删除版本信息');
+INSERT INTO `sys_role_permission` VALUES ('149', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '134', '各版本信息维护-版本信息维护-更新版本详情信息');
+INSERT INTO `sys_role_permission` VALUES ('150', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '135', '各版本信息维护-版本信息维护-删除版本详情信息');
+INSERT INTO `sys_role_permission` VALUES ('151', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '136', '各版本信息维护-版本信息维护-增加版本详情信息');
+INSERT INTO `sys_role_permission` VALUES ('152', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '137', 'ICSS数据维护-查体模板维护-查体模板列表');
+INSERT INTO `sys_role_permission` VALUES ('153', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '138', 'ICSS数据维护-查体模板维护-保存');
+INSERT INTO `sys_role_permission` VALUES ('154', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '139', 'ICSS数据维护-查体模板维护-根据科室删除');
+INSERT INTO `sys_role_permission` VALUES ('155', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '140', 'ICSS数据维护-查体模板维护-获取未维护的科室（新增）');
+INSERT INTO `sys_role_permission` VALUES ('156', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '141', 'ICSS数据维护-查体模板维护-获取未维护的科室（修改）');
+INSERT INTO `sys_role_permission` VALUES ('157', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '142', 'ICSS数据维护-查体模板维护-根据科室获取查体模板');
+INSERT INTO `sys_role_permission` VALUES ('163', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '148', 'ICSS数据维护-提示信息维护-保存');
+INSERT INTO `sys_role_permission` VALUES ('164', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '149', 'ICSS数据维护-提示信息维护-删除（单条）');
+INSERT INTO `sys_role_permission` VALUES ('165', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '150', 'ICSS数据维护-提示信息维护-删除（批量）');
+INSERT INTO `sys_role_permission` VALUES ('166', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '151', 'ICSS数据维护-提示信息维护-提示信息列表');
+INSERT INTO `sys_role_permission` VALUES ('167', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '152', 'ICSS数据维护-提示信息维护-根据id获取提示信息');
+INSERT INTO `sys_role_permission` VALUES ('168', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '153', 'ICSS数据维护-提示信息维护-获取未关联标签列表');
+INSERT INTO `sys_role_permission` VALUES ('171', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '156', 'ICSS数据维护-提示信息明细维护-删除（单条）');
+INSERT INTO `sys_role_permission` VALUES ('172', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '157', 'ICSS数据维护-提示信息明细维护-删除（批量）');
+INSERT INTO `sys_role_permission` VALUES ('173', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '158', 'ICSS数据维护-提示信息明细维护-根据id查询');
+INSERT INTO `sys_role_permission` VALUES ('174', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '159', 'ICSS数据维护-提示信息明细维护-根据提示信息id查询');
+INSERT INTO `sys_role_permission` VALUES ('175', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '160', 'ICSS数据维护-提示信息明细维护-保存');
+INSERT INTO `sys_role_permission` VALUES ('176', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('177', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '161', '各版本信息维护-版本信息维护-根据版本id获取版本详情信息');
+INSERT INTO `sys_role_permission` VALUES ('178', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '162', '医学术语库维护-医学术语命名维护-获取所有医学术语命名');
+INSERT INTO `sys_role_permission` VALUES ('179', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '163', '医学术语库维护-医学术语命名维护-获取医学术语命名列表');
+INSERT INTO `sys_role_permission` VALUES ('180', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '164', '医学术语库维护-医学术语命名维护-医学术语命名删除');
+INSERT INTO `sys_role_permission` VALUES ('181', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '165', '医学术语库维护-医学术语命名维护-获取医学术语命名详情');
+INSERT INTO `sys_role_permission` VALUES ('182', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '166', '医学术语库维护-术语医学属性维护-获取术语医学属性列表');
+INSERT INTO `sys_role_permission` VALUES ('183', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '167', '医学术语库维护-术语医学属性维护-获取术语医学属性详情');
+INSERT INTO `sys_role_permission` VALUES ('184', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '168', '医学术语库维护-术语医学属性维护-术语医学属性添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('185', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '169', '医学术语库维护-术语医学属性维护-术语医学属性删除');
+INSERT INTO `sys_role_permission` VALUES ('186', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '170', '医学术语库维护-医学术语关系维护-获取医学术语关系');
+INSERT INTO `sys_role_permission` VALUES ('187', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '171', '医学术语库维护-医学术语关系维护-保存医学术语关系');
+INSERT INTO `sys_role_permission` VALUES ('188', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '172', '医学术语库维护-医学术语关系维护-删除医学术语关系');
+INSERT INTO `sys_role_permission` VALUES ('189', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '173', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识列表');
+INSERT INTO `sys_role_permission` VALUES ('190', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '174', '医学术语库维护-医学术语静态知识维护-医学术语静态知识删除');
+INSERT INTO `sys_role_permission` VALUES ('191', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '175', '医学术语库维护-医学术语静态知识维护-获取医学术语静态知识详情');
+INSERT INTO `sys_role_permission` VALUES ('192', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '176', '医学术语库维护-医学术语静态知识维护-医学术语静态知识添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('193', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('194', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '177', 'ICSS数据维护-别名维护-标签搜索');
+INSERT INTO `sys_role_permission` VALUES ('195', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '178', 'ICSS数据维护-化验大小项与公表项对应维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('196', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '179', 'ICSS数据维护-化验大小项与公表项对应维护-保存');
+INSERT INTO `sys_role_permission` VALUES ('197', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '180', 'ICSS数据维护-化验大小项与公表项对应维护-是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('198', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '181', 'ICSS数据维护-化验大小项与公表项对应维护-删除(单条)');
+INSERT INTO `sys_role_permission` VALUES ('199', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '182', 'ICSS数据维护-化验大小项与公表项对应维护-删除(批量)');
+INSERT INTO `sys_role_permission` VALUES ('200', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '183', 'ICSS数据维护-获取模板type');
+INSERT INTO `sys_role_permission` VALUES ('201', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '184', 'ICSS数据维护-慢病评估维护-分页模糊查询标签组维护接口 ');
+INSERT INTO `sys_role_permission` VALUES ('202', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '185', 'ICSS数据维护-慢病评估维护-获取慢病标签组维护');
+INSERT INTO `sys_role_permission` VALUES ('203', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '186', 'ICSS数据维护-慢病评估维护-慢病评估维护——修改管理评估');
+INSERT INTO `sys_role_permission` VALUES ('204', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '187', 'ICSS数据维护-慢病评估维护-慢病评估维护——添加管理评估');
+INSERT INTO `sys_role_permission` VALUES ('205', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '188', 'ICSS数据维护-慢病评估维护-删除慢病标签组维护');
+INSERT INTO `sys_role_permission` VALUES ('207', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '189', 'ICSS数据维护-慢病指标值关联维护-分页模糊查询慢病指标值关联维护');
+INSERT INTO `sys_role_permission` VALUES ('208', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '190', 'ICSS数据维护-慢病指标值关联维护-获取慢病指标值关联维护');
+INSERT INTO `sys_role_permission` VALUES ('209', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '191', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——修改关联');
+INSERT INTO `sys_role_permission` VALUES ('210', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '192', 'ICSS数据维护-慢病指标值关联维护-慢病指标值关联维护——添加关联');
+INSERT INTO `sys_role_permission` VALUES ('211', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '193', 'ICSS数据维护-慢病指标值关联维护-删除慢病指标值关联维护');
+INSERT INTO `sys_role_permission` VALUES ('215', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '198', 'ICSS数据维护-独立标签维护-获取特殊标签（同伴|无）');
+INSERT INTO `sys_role_permission` VALUES ('216', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '199', 'ICSS数据维护-独立标签维护-根据id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('217', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '200', 'ICSS数据维护-独立标签维护-根据多个id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('218', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '201', 'ICSS数据维护-独立标签维护-检索');
+INSERT INTO `sys_role_permission` VALUES ('225', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '209', '医学术语库维护-术语医学属性维护-术语医学属性excel文件导入');
+INSERT INTO `sys_role_permission` VALUES ('226', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '210', '医学术语库维护-医学术语关系维护-医学术语关系添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('227', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '211', '医学术语库维护-医学术语关系维护-医学术语关系excel文件导入');
+INSERT INTO `sys_role_permission` VALUES ('228', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '213', '医学术语库维护-医学术语命名维护-医学术语命名添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('229', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '214', '医学术语库维护-医学术语命名维护-医学术语命名excel文件导入');
+INSERT INTO `sys_role_permission` VALUES ('230', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '215', '医学术语库维护-医学术语类型维护-获取所有术语类型');
+INSERT INTO `sys_role_permission` VALUES ('231', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '216', '医学术语库维护-医学术语类型维护-获取术语类型列表');
+INSERT INTO `sys_role_permission` VALUES ('232', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '217', '医学术语库维护-医学术语类型维护-术语类型添加');
+INSERT INTO `sys_role_permission` VALUES ('233', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '218', '医学术语库维护-医学术语关系维护-获取所有关系类型');
+INSERT INTO `sys_role_permission` VALUES ('234', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '219', '医学术语库维护-术语医学属性维护-获取所有部位');
+INSERT INTO `sys_role_permission` VALUES ('235', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '220', '医学术语库维护-术语医学属性维护-获取术语医学属性所需全部科室');
+INSERT INTO `sys_role_permission` VALUES ('236', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '221', '医学术语库维护-量表结构维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('237', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '222', '医学术语库维护-量表结构维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('238', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '223', '医学术语库维护-医学术语命名维护-获取所有化验公表项');
+INSERT INTO `sys_role_permission` VALUES ('239', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '224', '医学术语库维护-量表结构维护-删除|恢复');
+INSERT INTO `sys_role_permission` VALUES ('240', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '225', '医学术语库维护-量表结构维护-根据id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('241', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '227', '医学术语库维护-量表结构维护-检索');
+INSERT INTO `sys_role_permission` VALUES ('243', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '228', 'ICSS数据维护-模板维护-获取所有科室疾病信息');
+INSERT INTO `sys_role_permission` VALUES ('244', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '229', 'ICSS数据维护-慢病指标值关联维护-慢病指标疾病标签查询');
+INSERT INTO `sys_role_permission` VALUES ('245', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '230', 'ICSS数据维护-慢病评估维护-慢病疾病标签查询');
+INSERT INTO `sys_role_permission` VALUES ('246', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '231', 'ICSS数据维护-标签组维护-子标签检索');
+INSERT INTO `sys_role_permission` VALUES ('247', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '232', 'ICSS数据维护-模板维护-获取标签和模板关联信息（删除标签时校验用）');
+INSERT INTO `sys_role_permission` VALUES ('248', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '233', 'ICSS数据维护-查体模板维护-查询科室下拉列表(查询页面)');
+INSERT INTO `sys_role_permission` VALUES ('249', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '234', '医学术语库维护-医学术语命名维护-获取所有概念(术语关系维护时筛选使用)');
+INSERT INTO `sys_role_permission` VALUES ('250', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '235', '医学术语库维护-化验子项维护-列表');
+INSERT INTO `sys_role_permission` VALUES ('251', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '236', '医学术语库维护-化验子项维护-添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('252', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '237', '医学术语库维护-化验子项维护-详情');
+INSERT INTO `sys_role_permission` VALUES ('253', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '238', '医学术语库维护-化验子项维护-删除或者恢复');
+INSERT INTO `sys_role_permission` VALUES ('254', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '239', '医学术语库维护-医学术语关联维护-列表');
+INSERT INTO `sys_role_permission` VALUES ('255', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '240', '医学术语库维护-医学术语关联维护-添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('256', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '241', '医学术语库维护-医学术语关联维护-详情');
+INSERT INTO `sys_role_permission` VALUES ('257', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '242', '医学术语库维护-医学术语关联维护-删除或者恢复');
+INSERT INTO `sys_role_permission` VALUES ('258', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '243', '医学术语库维护-医学术语多层关联维护-列表');
+INSERT INTO `sys_role_permission` VALUES ('259', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '244', '医学术语库维护-医学术语多层关联维护-添加或者编辑');
+INSERT INTO `sys_role_permission` VALUES ('260', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '245', '医学术语库维护-医学术语多层关联维护-详情');
+INSERT INTO `sys_role_permission` VALUES ('261', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '246', '医学术语库维护-医学术语多层关联维护-删除或者恢复');
+INSERT INTO `sys_role_permission` VALUES ('262', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '247', '医学术语库维护-医学术语静态知识维护-内容检索');
+INSERT INTO `sys_role_permission` VALUES ('263', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '248', '预问诊数据维护-标签组维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('264', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '249', '预问诊数据维护-标签组维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('265', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '250', '预问诊数据维护-标签组维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('266', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '251', '预问诊数据维护-标签组维护-检索');
+INSERT INTO `sys_role_permission` VALUES ('267', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '252', '预问诊数据维护-标签组维护-根据id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('268', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '253', '预问诊数据维护-标签组维护-根据多个id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('269', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '254', '预问诊数据维护-独立填写单维护-新增|修改');
+INSERT INTO `sys_role_permission` VALUES ('270', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '255', '预问诊数据维护-独立填写单维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('271', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '256', '预问诊数据维护-独立填写单维护-分页列表');
+INSERT INTO `sys_role_permission` VALUES ('272', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '257', '预问诊数据维护-独立填写单维护-检索');
+INSERT INTO `sys_role_permission` VALUES ('273', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '258', '预问诊数据维护-独立填写单维护-根据id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('274', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '259', '预问诊数据维护-独立填写单维护-根据多个id返回内容');
+INSERT INTO `sys_role_permission` VALUES ('275', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '260', '预问诊数据维护-模板维护-模板新增');
+INSERT INTO `sys_role_permission` VALUES ('277', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '262', '预问诊数据维护-模板维护-模板删除');
+INSERT INTO `sys_role_permission` VALUES ('278', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '263', '预问诊数据维护-模板维护-获取模板列表');
+INSERT INTO `sys_role_permission` VALUES ('279', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '264', '预问诊数据维护-模板维护-修改时获取已经添加过的标签');
+INSERT INTO `sys_role_permission` VALUES ('280', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '265', '预问诊数据维护-模板维护-获取单个模板(修改用)');
+INSERT INTO `sys_role_permission` VALUES ('281', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '266', '预问诊数据维护-模板维护-获取模板类型(修改时取类型)');
+INSERT INTO `sys_role_permission` VALUES ('282', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '267', '预问诊数据维护-模板维护-获取所有科室信息(主页下拉用)');
+INSERT INTO `sys_role_permission` VALUES ('283', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '268', '预问诊数据维护-模板维护-获取标签和模板关联信息');
+INSERT INTO `sys_role_permission` VALUES ('284', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '272', '诊断依据维护-诊断依据数据维护-分页');
+INSERT INTO `sys_role_permission` VALUES ('285', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '273', '诊断依据维护-诊断依据数据维护-删除');
+INSERT INTO `sys_role_permission` VALUES ('286', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '274', '诊断依据维护-诊断依据数据维护-诊断检索');
+INSERT INTO `sys_role_permission` VALUES ('287', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '275', '诊断依据维护-诊断依据数据维护-校验数据');
+INSERT INTO `sys_role_permission` VALUES ('288', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '276', '诊断依据维护-诊断依据数据维护-校验所有数据');
+INSERT INTO `sys_role_permission` VALUES ('289', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '277', '诊断依据维护-诊断依据数据维护-更新图谱');
+INSERT INTO `sys_role_permission` VALUES ('290', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '278', '诊断依据维护-诊断依据数据维护-获取详情');
+INSERT INTO `sys_role_permission` VALUES ('291', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '269', '诊断依据维护-导出诊断依据问题词');
+INSERT INTO `sys_role_permission` VALUES ('292', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '270', '诊断依据维护-导出诊断依据');
+INSERT INTO `sys_role_permission` VALUES ('293', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '271', '诊断依据维护-诊断依据问题词数据维护-分页查询');
+INSERT INTO `sys_role_permission` VALUES ('294', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '64', '朗通-客户中心-分页查询注册用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('295', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('296', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('297', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('298', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '63', '朗通-默认-获取用户、机构、菜单信息');

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -24,6 +24,7 @@ import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleIndexDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -40,6 +41,7 @@ import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.ScaleIndexVO;
+import com.diagbot.vo.VersionVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -232,4 +234,10 @@ public interface AiptServiceClient {
      */
     @PostMapping("/concept/getStaticKnowledge")
     RespDTO<List<RetrievalDTO>> getStaticKnowledge(GetStaticKnowledgeVO getStaticKnowledgeVO);
+
+    /**
+     * 获取版本信息
+     */
+    @PostMapping("/versionInfo/getVersionInfoAlls")
+    RespDTO<VersionWrapperDTO> getVersionInfoAlls(@RequestBody VersionVO versionVO);
 }

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -24,6 +24,7 @@ import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleIndexDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -40,6 +41,7 @@ import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.ScaleIndexVO;
+import com.diagbot.vo.VersionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -297,4 +299,14 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getStaticKnowledge");
         return null;
     }
+
+
+    /**
+     * 获取版本信息
+     */
+    @Override
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(VersionVO versionVO){
+        log.error("【hystrix】调用{}异常", "getVersionInfoAlls");
+        return null;
+    }
 }

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

@@ -1,56 +1,34 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
-import com.diagbot.entity.VersionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.VersionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @author wangfeng
  * @Description: 版本信息
  * @date 2018年11月21日 上午11:07:01
  */
 @Component
-public class VersionInfoFacade extends VersionInfoServiceImpl {
+public class VersionInfoFacade {
 
     @Autowired
-    VersionDetailFacaed versionDetailFacaed;
-
-
+    private AiptServiceClient aiptServiceClient;
     /**
      * 查询版本信息
      *
      * @return
      */
     public VersionWrapperDTO getVersionInfoAll() {
-        //查询最新的一条版本信息
-        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("STATUS", StatusEnum.Enable.getKey())
-                .orderByDesc("gmt_modified");
-
-        VersionInfo versionInfo = getOne(versionInfoQuery);
-        VersionWrapperDTO versionList = new VersionWrapperDTO();
-
-        if (versionInfo != null) {
-            //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-            long id = versionInfo.getId();
-            List<VersionDetailDTO> detail = versionDetailFacaed.getById(id);
-            //System.out.println(detail.toString());
-            versionList.setId(versionInfo.getId());
-            versionList.setName(versionInfo.getName());
-            versionList.setRefreshTime(versionInfo.getRefreshTime());
-            versionList.setStatus(versionInfo.getStatus());
-            versionList.setDetail(detail);
-        }
-
-        return versionList;
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.ICSS.getKey());
+        RespDTO<VersionWrapperDTO> res = aiptServiceClient.getVersionInfoAlls(versionVO);
+        RespDTOUtil.respNGDealCover(res, "获取不到版本信息！");
+        return res.data;
     }
 }

icss-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

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

@@ -20,6 +20,7 @@ public class QuestionDTO {
     private Long id;// id
     private String name;//内容
     private String tagName;//标签名称
+    private Integer sexType; // 性别
     private Integer type;//类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
     private Integer controlType; //控件类型
     private Integer subType; //检索类型

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

@@ -37,6 +37,7 @@ import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ConceptExistVO;
+import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
@@ -95,6 +96,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     KnowledgemanServiceClient knowledgemanServiceClient;
     @Autowired
     CacheFacade cacheFacade;
+    @Autowired
+    private KnowledgemanServiceClient klmServiceClient;
 
 
 
@@ -525,6 +528,29 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         getQuestiongAndModuleRelationsDTO.getRelationInfos().toString());
             }
+            //查体模板
+            QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+            deptVitalQueryWrapper.in("vital_id", Arrays.asList(ids.split(","))).
+                    eq("is_deleted", IsDeleteEnum.N.getKey());
+            List<DeptVital> deptVitals = deptVitalFacade.list(deptVitalQueryWrapper);
+            if (ListUtil.isNotEmpty(deptVitals)) {
+                //科室信息
+                List<Long> deptIds = deptVitals.stream().map(deptVitalDTO -> deptVitalDTO.getDeptId()).collect(Collectors.toList());
+                ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
+                conceptSearchVO.setConceptIds(deptIds);
+                RespDTO<Map<Long, String>> deptMap = klmServiceClient.getConceptMap(conceptSearchVO);
+                Map<Long, String> depts = deptMap.data;
+                //输入内容
+                StringBuffer sb = new StringBuffer();
+                sb.append("请先删除科室查体模板关联中的对应标签：");
+                for (DeptVital deptVital : deptVitals) {
+                    if(StringUtil.isNotBlank(depts.get(deptVital.getDeptId()))){
+                        sb.append("【" + depts.get(deptVital.getDeptId()) + "】").append("<br/>");
+                    }
+                }
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        sb.toString());
+            }
             //删除自身
             this.deleteByIds(paramMap);
             //删除明细

knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -37,6 +37,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/commonconcept/getConceptMapByNameAndType").permitAll()
                 .antMatchers("/commonconcept/index").permitAll()
                 .antMatchers("/commonconcept/indexByLexicon").permitAll()
+                .antMatchers("/versionInfo/getVersionInfoInner").permitAll()
+                .antMatchers("/versionInfo/getVersionInfoOuter").permitAll()
                 .antMatchers("/diagnose/initNeo").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();

knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -100,6 +100,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/commonconcept/getConceptMapByNameAndType", request)
                 || matchers("/commonconcept/index", request)
                 || matchers("/commonconcept/indexByLexicon", request)
+                || matchers("/versionInfo/getVersionInfoInner", request)
+                || matchers("/versionInfo/getVersionInfoOuter", request)
                 || matchers("/diagnose/initNeo", request)
                 || matchers("/", request)) {
             return true;

knowledgeman-service/src/main/java/com/diagbot/dto/MultContactListDTO.java

@@ -15,8 +15,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class MultContactListDTO {
-
+public class OnlyByRootListDTO {
+	
 	/**
      * 医学标准术语id
      */
@@ -28,6 +28,12 @@ public class MultContactListDTO {
      */
 	@ApiModelProperty(value="医学标准术语名称")
     private String libName;
+	
+	/**
+	 * 医学标准术语类型id
+	 */
+	@ApiModelProperty(value="医学标准术语类型id")
+	private Long libTypeId;
     
     /**
      * 医学标准术语类型
@@ -40,17 +46,12 @@ public class MultContactListDTO {
 	 */
 	private String libNameType;
     
-	/**
-	 * 非前端使用，下一级概念id合并字符串，用","隔开
-	 */
-	private String otherIds;
-	
     /**
      * 关联术语
      */
 	@ApiModelProperty(value="关联术语")
     private String otherNames;
-	
+    
     /**
      * 操作人
      */
@@ -70,5 +71,6 @@ public class MultContactListDTO {
 	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
 	private String isDeleted;
     
+    
 
 }

knowledgeman-service/src/main/java/com/diagbot/dto/RelationContactListDTO.java

@@ -15,9 +15,9 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class RelationContactListDTO {
-    
-    /**
+public class SingleRelationListDTO {
+	
+	/**
      * 医学标准术语id
      */
 	@ApiModelProperty(value="医学标准术语id")
@@ -29,6 +29,12 @@ public class RelationContactListDTO {
 	@ApiModelProperty(value="医学标准术语名称")
     private String libName;
     
+	/**
+	 * 医学标准术语类型id
+	 */
+	@ApiModelProperty(value="医学标准术语类型id")
+	private Long libTypeId;
+	
     /**
      * 医学标准术语类型
      */
@@ -39,6 +45,18 @@ public class RelationContactListDTO {
 	 * 医学标准术语名称(医学标准术语类型)
 	 */
 	private String libNameType;
+	
+	/**
+	 * 关系模块类型编码
+	 */
+    @ApiModelProperty(value="关系模块类型编码")
+    private String relationModelTypeCode;
+    
+    /**
+     * 关系模块类型名称
+     */
+    @ApiModelProperty(value="关系模块类型名称")
+    private String relationModelTypeName;
     
     /**
      * 关联术语
@@ -66,8 +84,5 @@ public class RelationContactListDTO {
 	private String isDeleted;
     
     
-    
-    
-    
 
 }

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

@@ -1,60 +1,60 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:12:12
- */
-@Getter
-@Setter
-public class VersionDetailDTO {
-	
-	private Long id;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    //private String creator;
-
-    private String modifierid;
-    /**
-     * 版本主表id
-     */
-    private Long versionId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    //private String creator;
+
+    private String modifierid;
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/VersionDetailSpecDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailSpecDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+   // private String creator;
+
+  
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+  //  private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/VersionSpecDTO.java

@@ -0,0 +1,47 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionSpecDTO {
+
+    private Long id;
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    private Date refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    private List<VersionDetailSpecDTO> detail;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -1,51 +1,61 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:09:33
- */
-@Getter
-@Setter
-public class VersionWrapperDTO {
-	
-	private Long id;
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	//private String creator;
-	
-	private String modifierid;
-	/**
-	 * 名称
-	 */
-	private String name;
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date refreshTime;
-
-	/**
-	 * 1：启动，0：不启用
-	 */
-	private String status;
-
-	private List<VersionDetailDTO> detail;
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-}
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	//private String creator;
+	
+	private String modifierid;
+	/**
+	 * 产品类型
+	 */
+	private Integer productType;
+
+	/**
+	 * 产品类型名称
+	 */
+	private String productTypeName;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

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

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_version_detail")
+@TableName("kl_version_detail")
 public class VersionDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,21 +1,21 @@
 package com.diagbot.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 版本信息(关于)
  * </p>
  *
- * @author wangfeng
- * @since 2018-11-20
+ * @author gaodm
+ * @since 2019-08-07
  */
-@TableName("icss_version_info")
+@TableName("kl_version_info")
 public class VersionInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -48,6 +48,11 @@ public class VersionInfo implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+
     /**
      * 名称
      */
@@ -107,6 +112,13 @@ public class VersionInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
     public String getName() {
         return name;
     }
@@ -145,6 +157,7 @@ public class VersionInfo implements Serializable {
         ", gmtModified=" + gmtModified +
         ", creator=" + creator +
         ", modifier=" + modifier +
+        ", productType=" + productType +
         ", name=" + name +
         ", refreshTime=" + refreshTime +
         ", status=" + status +

knowledgeman-service/src/main/java/com/diagbot/enums/RelationModelTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/7 14:06
+ */
+public enum RelationModelTypeEnum implements KeyedNamed {
+    KSCY(471011,"科室常用"),
+    HYCY(4710112,"化验常用"),
+    FJCY(4710116,"辅检常用"),
+    ZDGLLB(1810148,"诊断关联量表");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    RelationModelTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static RelationModelTypeEnum getEnum(Integer key) {
+        for (RelationModelTypeEnum item : RelationModelTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        RelationModelTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -199,48 +199,61 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<GetAllForRelationDTO> getAllForRelation(GetAllForRelationVO getAllForRelationVO) {
-        List<GetAllForRelationDTO> retList = new ArrayList<>();
-        if(StringUtil.isBlank(getAllForRelationVO.getName())&&getAllForRelationVO.getTypeId()==null){
-        	return retList;
-        }
-
-        QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-        conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        conceptQe.like(StringUtil.isNotBlank(getAllForRelationVO.getName()),"lib_name", getAllForRelationVO.getName());
-        conceptQe.eq(getAllForRelationVO.getTypeId()!=null,"lib_type", getAllForRelationVO.getTypeId());
-        List<Concept> conceptList = list(conceptQe);
-
-        Map<Long, Long> reCouMap = new HashMap<>();
-        if (getAllForRelationVO.getRelationPosition() != 3) {
-            if (getAllForRelationVO.getRelationId() == null) {
-                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "关系类型id必传！");
-            }
+        List<GetAllForRelationDTO> retList = Lists.newArrayList();
+        
+        if(StringUtil.isNotBlank(getAllForRelationVO.getName())||getAllForRelationVO.getTypeId()!=null){
+        	QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+            conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+            conceptQe.like(StringUtil.isNotBlank(getAllForRelationVO.getName()),"lib_name", getAllForRelationVO.getName());
+            conceptQe.eq(getAllForRelationVO.getTypeId()!=null,"lib_type", getAllForRelationVO.getTypeId());
+            List<Concept> conceptList = list(conceptQe);
+            
+            if(ListUtil.isNotEmpty(conceptList)){
+            	Map<Long, Long> reCouMap = new HashMap<>();
+                if (getAllForRelationVO.getRelationPosition() != 3) {
+                    if (getAllForRelationVO.getRelationId() == null) {
+                        throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "关系类型id必传！");
+                    }
 
-            List<Long> conceptIdList = conceptList.stream().map(i -> i.getId()).collect(Collectors.toList());
-            QueryWrapper<Relation> relationQe = new QueryWrapper<>();
-            relationQe.eq("relation_id", getAllForRelationVO.getRelationId());
-            if (getAllForRelationVO.getRelationPosition() == 1) {
-            	relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "end_id", getAllForRelationVO.getRelationConceptId());
-            	relationQe.and(wrapper->wrapper.in("start_id", conceptIdList).or(getAllForRelationVO.getRelationConceptId() == null).in("end_id", conceptIdList));
-                reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
-            } else if(getAllForRelationVO.getRelationConceptId() != null) {
-                relationQe.in("end_id", conceptIdList);
-                relationQe.eq("start_id", getAllForRelationVO.getRelationConceptId());
-                reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getEndId, Collectors.counting()));
-            }
-        }
+                    List<Long> conceptIdList = conceptList.stream().map(i -> i.getId()).collect(Collectors.toList());
+                    QueryWrapper<Relation> relationQe = new QueryWrapper<>();
+                    relationQe.eq("relation_id", getAllForRelationVO.getRelationId());
+                    
+                    List<Long> relationConceptIdList = Lists.newArrayList();
+                    if(getAllForRelationVO.getRelationTypeId() != null){
+                    	QueryWrapper<Concept> conceptQe1 = new QueryWrapper<>();
+                    	conceptQe1.eq("lib_type", getAllForRelationVO.getRelationTypeId());
+                    	relationConceptIdList = list(conceptQe1).stream().map(i->i.getId()).collect(Collectors.toList());
+                    }
+                    if(getAllForRelationVO.getRelationConceptId() != null){
+                    	relationConceptIdList.add(getAllForRelationVO.getRelationConceptId());
+                    }
+                    if(ListUtil.isNotEmpty(relationConceptIdList)){
+                    	if (getAllForRelationVO.getRelationPosition() == 1) {
+                    		relationQe.in("start_id", conceptIdList);
+                    		relationQe.in("end_id", relationConceptIdList);
+                    		reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
+                    	}else{
+                    		relationQe.in("end_id", conceptIdList);
+                            relationQe.in("start_id", relationConceptIdList);
+                            reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getEndId, Collectors.counting()));
+                    	}
+                    }
+                }
 
-        for (Concept i : conceptList) {
-            if (reCouMap.get(i.getId()) != null
-                    || (getAllForRelationVO.getExcludedConceptIds() != null && getAllForRelationVO.getExcludedConceptIds().contains(i.getId()))
-                    || (getAllForRelationVO.getRelationConceptId() != null && getAllForRelationVO.getRelationConceptId() == i.getId())) {
-                continue;
+                for (Concept i : conceptList) {
+                    if (reCouMap.get(i.getId()) != null
+                            || (getAllForRelationVO.getExcludedConceptIds() != null && getAllForRelationVO.getExcludedConceptIds().contains(i.getId()))
+                            || (getAllForRelationVO.getRelationConceptId() != null && getAllForRelationVO.getRelationConceptId() == i.getId())) {
+                        continue;
+                    }
+                    GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
+                    getAllForRelationDTO.setConceptId(i.getId());
+                    getAllForRelationDTO.setConceptName(i.getLibName());
+                    getAllForRelationDTO.setConceptNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getLibType().intValue())+")");
+                    retList.add(getAllForRelationDTO);
+                }	
             }
-            GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
-            getAllForRelationDTO.setConceptId(i.getId());
-            getAllForRelationDTO.setConceptName(i.getLibName());
-            getAllForRelationDTO.setConceptNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getLibType().intValue())+")");
-            retList.add(getAllForRelationDTO);
         }
 
         return retList;
@@ -1309,4 +1322,22 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
         return res;
     }
+    
+    /**
+     * 筛选符合类型的概念id
+     * @param libTypeId
+     * @param sourceConceptIds
+     * @return
+     */
+    public List<Long> getCompatibleTypeConceptIds(Long libTypeId,List<Long> sourceConceptIds){
+    	if(libTypeId==null||ListUtil.isEmpty(sourceConceptIds)){
+    		return null;
+    	}
+    	QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+    	conceptQe.in("id", sourceConceptIds);
+    	conceptQe.eq("lib_type", libTypeId);
+    	return list(conceptQe).stream().map(i->i.getId()).collect(Collectors.toList());
+    }
+    
+    
 }

knowledgeman-service/src/main/java/com/diagbot/facade/MultContactFacade.java

@@ -1,28 +1,21 @@
 package com.diagbot.facade;
 
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.MultContactListDTO;
+import com.diagbot.dto.OnlyByRootListDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.Concept;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.MultContactListVO;
+import com.diagbot.vo.OnlyByRootListVO;
 
 /**
  * @Description: 医学术语关联业务层
@@ -34,45 +27,29 @@ public class MultContactFacade extends RelationServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
-    @Autowired
-    private ConceptFacade conceptFacade;
 
     /**
      * 医学术语多层关联维护-列表
      * @param multContactListVO
      * @return
      */
-    public IPage<MultContactListDTO> multContactList(MultContactListVO multContactListVO) {
-    	if(StringUtil.isNotBlank(multContactListVO.getName())||StringUtil.isNotBlank(multContactListVO.getType())){
-    		QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-    		conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-    		conceptQe.like(StringUtil.isNotBlank(multContactListVO.getName()),"lib_name", multContactListVO.getName());
-        	conceptQe.eq(StringUtil.isNotBlank(multContactListVO.getType()),"lib_type", LexiconTypeEnum.getKey(multContactListVO.getType()));
-        	multContactListVO.setRootNodeConceptIds(conceptFacade.list(conceptQe).stream().map(i->i.getId()).collect(Collectors.toList()));
-    	}
+    public IPage<OnlyByRootListDTO> multContactList(OnlyByRootListVO onlyByRootListVO) {
+    	IPage<OnlyByRootListDTO> ipage = this.baseMapper.onlyByRootList(onlyByRootListVO);
     	
-        IPage<MultContactListDTO> multContactListDTOPage = this.baseMapper.multContactList(multContactListVO);
-        
-        if(ListUtil.isNotEmpty(multContactListDTOPage.getRecords())){
-        	List<String> userIds = multContactListDTOPage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
+    	if(ListUtil.isNotEmpty(ipage.getRecords())){
+    		List<String> userIds = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
         	RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
         	RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
         	
-        	Set<Long> otherIds = new HashSet<>();
-        	otherIds.addAll(Arrays.asList(multContactListDTOPage.getRecords().stream().map(i->i.getOtherIds()).collect(Collectors.joining(",")).split(",")).stream().map(i->Long.parseLong(i)).collect(Collectors.toList()));
-        	otherIds.addAll(multContactListDTOPage.getRecords().stream().map(i->i.getConceptId()).collect(Collectors.toList()));
-        	Map<Long,Concept> conceptMap = conceptFacade.listByIds(otherIds).stream().collect(Collectors.toMap(Concept::getId, i->i));
-        	
-        	multContactListDTOPage.getRecords().forEach(i->{
+        	ipage.getRecords().forEach(i->{
         		i.setOperName(respDTO.data.get(i.getOperName()));
-        		i.setLibName(conceptMap.get(i.getConceptId()).getLibName());
-        		i.setLibType(LexiconTypeEnum.getName(conceptMap.get(i.getConceptId()).getLibType().intValue()));
-        		i.setLibNameType(i.getLibName()+"("+i.getLibType()+")");
-        		i.setOtherNames(Arrays.asList(i.getOtherIds().split(",")).stream().map(k->conceptMap.get(Long.parseLong(k)).getLibName()).collect(Collectors.joining(",")));
+        		i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
+                i.setLibNameType(i.getLibName()+"("+i.getLibType()+")");
+        		
         	});
-        }
-        
-        return multContactListDTOPage;
+    	}
+
+    	return ipage;
     }
 
 }

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -13,14 +13,15 @@ import org.springframework.stereotype.Component;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RelationContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SingleRelationListDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.Relation;
 import com.diagbot.entity.RelationOrder;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.enums.RelationModelTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
@@ -30,10 +31,13 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DeleteRelationContactVO;
 import com.diagbot.vo.RelationContactDetailVO;
-import com.diagbot.vo.RelationContactListVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
+import com.diagbot.vo.SingleRelationListVO;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 /**
  * @Description: 医学术语关联业务层
@@ -61,14 +65,21 @@ public class RelationContactFacade extends RelationServiceImpl {
      * @param relationContactListVO
      * @return
      */
-    public IPage<RelationContactListDTO> relationContactList(RelationContactListVO relationContactListVO) {
-    	IPage<RelationContactListDTO> ipage = this.baseMapper.relationContactList(relationContactListVO);
-        if (ipage.getRecords().size() > 0) {
+    public IPage<SingleRelationListDTO> relationContactList(SingleRelationListVO singleRelationListVO) {
+    	String[] relationModelTypeArry = singleRelationListVO.getRelationModelTypeCode().split("101");
+    	singleRelationListVO.setStartTypeId(Long.parseLong(relationModelTypeArry[0]));
+    	singleRelationListVO.setEndTypeId(Long.parseLong(relationModelTypeArry[1]));
+    	
+    	IPage<SingleRelationListDTO> ipage = this.baseMapper.singleRelationList(singleRelationListVO);
+        if (ListUtil.isNotEmpty(ipage.getRecords())) {
             List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             ipage.getRecords().forEach(i -> {
                 i.setOperName(respDTO.data.get(i.getOperName()));
+                i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
+                i.setLibNameType(i.getLibName()+"("+i.getLibType()+")");
+                i.setRelationModelTypeName(RelationModelTypeEnum.getName(Integer.parseInt(i.getRelationModelTypeCode())));
             });
         }
         return ipage;
@@ -83,12 +94,14 @@ public class RelationContactFacade extends RelationServiceImpl {
 		if(relationNodeVO.getConceptId()==null){
 			throw new CommonException(CommonErrorCode.RPC_ERROR,"conceptId必填！");
 		}
-		if(relationNodeVO.getNodeList()==null||relationNodeVO.getNodeList().size()==0){
+		if(ListUtil.isEmpty(relationNodeVO.getNodeList())){
 			throw new CommonException(CommonErrorCode.RPC_ERROR,"nodeList不能为空！");
 		}
 		
-		List<Long> relationIdList = repairRelationDataForDelBeforeAdd(relationNodeVO.getConceptId(), relationNodeVO.getSonRelationId());
+		List<Long> relationIdList = repairRelationDataForDelBeforeAdd(relationNodeVO.getConceptId(),relationNodeVO);
 		if(ListUtil.isNotEmpty(relationIdList)){
+			removeByIds(relationIdList);
+			
 			QueryWrapper<RelationOrder> relationOrderQe = new QueryWrapper<>();
 			relationOrderQe.in("t_relation_id", relationIdList);
 			relationOrderFacade.remove(relationOrderQe);
@@ -97,7 +110,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		List<List<Relation>> relationGroupList = repairRelationDataForAdd(relationNodeVO);
 		String currentUser = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
-        List<Relation> relationList = new ArrayList<>();
+        List<Relation> relationList = Lists.newArrayList();
         relationGroupList.forEach(i->{
         	i.forEach(j->{
         		j.setCreator(currentUser);
@@ -110,7 +123,7 @@ public class RelationContactFacade extends RelationServiceImpl {
         relationService.saveOrUpdateBatch(relationList);
         
         if(relationNodeVO.getIsOrderBy()==1){
-        	List<RelationOrder> relationOrderList = new ArrayList<>();
+        	List<RelationOrder> relationOrderList = Lists.newArrayList();
         	relationGroupList.forEach(i->{
         		int orderNo = 0;
             	for(Relation j : i){
@@ -133,30 +146,40 @@ public class RelationContactFacade extends RelationServiceImpl {
 	
 	/**
 	 * 处理关系节点-添加或者编辑前先删除掉
-	 * @param conceptId
-	 * @param relationId
+	 * @param conceptId 当前概念id
+	 * @param relationNodeVO
 	 * @return
 	 */
-	private List<Long> repairRelationDataForDelBeforeAdd(Long conceptId,Long relationId){
-		List<Long> relationIdList = new ArrayList<>();
+	private List<Long> repairRelationDataForDelBeforeAdd(Long conceptId,RelationNodeVO relationNodeVO){
+		List<Long> relationIdList = Lists.newArrayList();
 		
 		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
 		relationQe.eq("start_id", conceptId);
-		relationQe.eq(relationId!=null,"relation_id", relationId);
-		List<Relation> relationList = list(relationQe);
-		
-		if(relationList.size()==0){
-			return relationIdList;
+		if(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null){
+			relationQe.eq("relation_id", relationNodeVO.getSonRelationId());
 		}
+		List<Relation> relationList = list(relationQe);
 		
-		relationIdList.addAll(relationList.stream().map(i->i.getId()).collect(Collectors.toList()));
-		
-		relationList.forEach(i->{
-			relationIdList.addAll(repairRelationDataForDelBeforeAdd(i.getEndId(),relationId));
-		});
-		
-		if(!remove(relationQe)){
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
+		if(ListUtil.isNotEmpty(relationList)){
+			if(relationNodeVO!=null&&relationNodeVO.getSonTypeId()!=null){
+				List<Long> conceptIdList = conceptFacade.getCompatibleTypeConceptIds(relationNodeVO.getSonTypeId(), relationList.stream().map(i->i.getEndId()).collect(Collectors.toList()));
+	        	if(conceptIdList!=null){
+	        		relationList = relationList.stream().filter(i->conceptIdList.contains(i.getEndId())).collect(Collectors.toList());
+	        	}
+			}
+			
+			if(ListUtil.isNotEmpty(relationList)){
+				relationIdList.addAll(relationList.stream().map(i->i.getId()).collect(Collectors.toList()));
+				
+				Map<Long,RelationNodeVO> conceptIdRnMap = Maps.newHashMap();
+				if(relationNodeVO!=null&&ListUtil.isNotEmpty(relationNodeVO.getNodeList())){
+					conceptIdRnMap = relationNodeVO.getNodeList().stream().collect(Collectors.toMap(RelationNodeVO::getConceptId, i->i));
+				}
+				
+				for(Relation i : relationList){
+					relationIdList.addAll(repairRelationDataForDelBeforeAdd(i.getEndId(),conceptIdRnMap.get(i.getEndId())));
+				}
+			}
 		}
 		
 		return relationIdList;
@@ -168,10 +191,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @return
 	 */
 	private List<List<Relation>> repairRelationDataForAdd(RelationNodeVO relationNodeVO){
-		List<List<Relation>> retList = new ArrayList<>();
+		List<List<Relation>> retList = Lists.newArrayList();
 		
-		if(relationNodeVO.getNodeList()!=null&&relationNodeVO.getNodeList().size()>0){
-			List<Relation> relationList = new ArrayList<>();
+		if(ListUtil.isNotEmpty(relationNodeVO.getNodeList())){
+			List<Relation> relationList = Lists.newArrayList();
 			relationNodeVO.getNodeList().forEach(i->{
 				Relation relation = new Relation();
 				relation.setStartId(relationNodeVO.getConceptId());
@@ -179,7 +202,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 				relation.setRelationId(i.getRelationId());
 				relationList.add(relation);
 				
-				if(i.getNodeList()!=null&&i.getNodeList().size()>0){
+				if(ListUtil.isNotEmpty(i.getNodeList())){
 					retList.addAll(repairRelationDataForAdd(i));
 				}
 			});
@@ -205,7 +228,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationNodeDTO.setConceptNameType(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
 		relationNodeDTO.setIsDeletedConcept(concept.getIsDeleted());
 		
-		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId(),null,concept.getIsDeleted()));
+		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(),relationContactDetailVO.getRelationIds(),relationContactDetailVO.getTypeIds(),null,concept.getIsDeleted()));
 		
 		return relationNodeDTO;
 	}
@@ -213,18 +236,29 @@ public class RelationContactFacade extends RelationServiceImpl {
 	/**
 	 * 处理关系节点-查询事件
 	 * @param conceptId
-	 * @param relationId
+	 * @param relationIds
+	 * @param typeIds
 	 * @param hookConceptIds
 	 * @param isDeletedParent
 	 * @return
 	 */
-	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId,List<Long> hookConceptIds,String isDeletedParent){
+	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,List<Long> relationIds,List<Long> typeIds,List<Long> hookConceptIds,String isDeletedParent){
 		if(hookConceptIds==null){
 			hookConceptIds = new ArrayList<>();
 			hookConceptIds.add(conceptId);
 		}
 		
-		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId,relationId);
+		Long relationId = null,endTypeId = null;
+		if(ListUtil.isNotEmpty(relationIds)){
+			relationId = relationIds.remove(0);
+		}
+		if(relationId==null){
+			relationId = -999999l;
+		}
+		if(ListUtil.isNotEmpty(typeIds)){
+			endTypeId = typeIds.remove(0);
+		}
+		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId,relationId,endTypeId);
 		
 		for(RelationNodeDTO i : relationNodeDTOList){
 			i.setConceptTypeName(LexiconTypeEnum.getName(i.getConceptTypeId().intValue()));
@@ -237,7 +271,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 				List<Long> hookConceptIds_ = new ArrayList<>();
 				hookConceptIds_.addAll(hookConceptIds);
 				hookConceptIds_.add(i.getConceptId());
-				i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId,hookConceptIds_,i.getIsDeletedConcept()));
+				i.setNodeList(repairRelationDataForQuery(i.getConceptId(),Lists.newArrayList(relationIds),Lists.newArrayList(typeIds),hookConceptIds_,i.getIsDeletedConcept()));
 			}
 		}
 		
@@ -306,8 +340,8 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @param removeRelationContactVO
 	 * @return
 	 */
-	public Boolean deleteRelationContact(RemoveRelationContactVO removeRelationContactVO){
-		repairRelationDataForDelete(removeRelationContactVO.getConceptId(), removeRelationContactVO.getRelationId());
+	public Boolean deleteRelationContact(DeleteRelationContactVO deleteRelationContactVO){
+		repairRelationDataForDelete(deleteRelationContactVO.getConceptId(), deleteRelationContactVO.getRelationIds(),deleteRelationContactVO.getTypeIds());
 		return true;
 	}
 	
@@ -316,24 +350,39 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @param conceptId
 	 * @param relationId
 	 */
-	private void repairRelationDataForDelete(Long conceptId,Long relationId){
+	private void repairRelationDataForDelete(Long conceptId,List<Long> relationIds,List<Long> typeIds){
+		Long relationId = null,endTypeId = null;
+		if(ListUtil.isNotEmpty(relationIds)){
+			relationId = relationIds.remove(0);
+		}
+		if(ListUtil.isNotEmpty(typeIds)){
+			endTypeId = typeIds.remove(0);
+		}
+		
 		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
 		relationQe.eq("start_id", conceptId);
 		relationQe.eq(relationId!=null,"relation_id", relationId);
 		List<Relation> relationList = list(relationQe);
 		
-		if(relationList.size()==0){
+		if(endTypeId!=null&&ListUtil.isNotEmpty(relationList)){
+			List<Long> conceptIdList = conceptFacade.getCompatibleTypeConceptIds(endTypeId,relationList.stream().map(i->i.getEndId()).collect(Collectors.toList()));
+        	relationList = relationList.stream().filter(i->conceptIdList.contains(i.getEndId())).collect(Collectors.toList());
+		}
+		
+		if(ListUtil.isEmpty(relationList)){
 			return;
 		}
 		
+		List<Long> removeRelationIds = relationList.stream().map(i->i.getId()).collect(Collectors.toList());
+		
 		QueryWrapper<RelationOrder> relationOrderQe = new QueryWrapper<>();
-		relationOrderQe.in("t_relation_id", relationList.stream().map(i->i.getId()).collect(Collectors.toList()));
-		if(!remove(relationQe)||!relationOrderFacade.remove(relationOrderQe)){
+		relationOrderQe.in("t_relation_id", removeRelationIds);
+		if(!removeByIds(removeRelationIds)||!relationOrderFacade.remove(relationOrderQe)){
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
 		}
 		
-		relationList.forEach(i->{
-			repairRelationDataForDelete(i.getEndId(), relationId);
+		removeRelationIds.forEach(i->{
+			repairRelationDataForDelete(i, Lists.newArrayList(relationIds), Lists.newArrayList(typeIds));
 		});
 	}
 

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

@@ -1,223 +1,275 @@
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.VersionDetailDTO;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.entity.VersionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.VersionDetailServiceImpl;
-import com.diagbot.service.impl.VersionInfoServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.VersionDetailIdVO;
-import com.diagbot.vo.VersionDetailVO;
-import com.diagbot.vo.VersionInfoAndDetailIdVO;
-
-/**
- * 版本详情
- *
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 上午11:38:40
- */
-@Component
-public class VersionDetailFacade extends VersionDetailServiceImpl {
-
-    @Autowired
-    VersionDetailServiceImpl versionDetailServiceImpl;
-    @Autowired
-    UserServiceClient userServiceClient;
-    @Autowired
-    VersionInfoServiceImpl versionInfoServiceImpl;
-
-    /**
-     * 根据版本id查询版本详情
-     *
-     * @param id
-     * @return
-     */
-    public List<VersionDetailDTO> getById(Long id) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .eq("version_id", id).orderByAsc("order_no");
-
-        VersionDetail versionDetail = new VersionDetail();
-        versionDetail.setVersionId(id);
-        List<VersionDetail> datas = list(versionDetailQuery);
-        // System.out.println("List<VersionDetail>==="+datas.toString());
-        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        // 过滤字段
-        for (VersionDetail versionData : datas) {
-            VersionDetailDTO versionDTO = new VersionDetailDTO();
-            versionDTO.setId(versionData.getId());
-            //versionDTO.setCreator(versionData.getCreator());
-            versionDTO.setDescription(versionData.getDescription());
-            versionDTO.setGmtCreate(versionData.getGmtCreate());
-            versionDTO.setOrderNo(versionData.getOrderNo());
-            versionDTO.setRemark(versionData.getRemark());
-            versionDTO.setStatus(versionData.getStatus());
-            versionDTO.setTitle(versionData.getTitle());
-            versionDTO.setVersionId(versionData.getVersionId());
-            dataNew.add(versionDTO);
-        }
-        return dataNew;
-
-    }
-
-    /**
-     * 根据版本ids查询版本详情
-     *
-     * @param ids
-     * @return
-     */
-    public List<VersionDetailDTO> getByIds(List<Long> ids) {
-        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .in("version_id", ids).orderByAsc("order_no");
-
-        List<VersionDetail> datas = list(versionDetailQuery);
-        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-        List<String> modifierid = new ArrayList<>();
-        modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-        Map<String, String> userNames = new HashMap<>();
-        if (modifierid.size() > 0) {
-            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "获取所有用户信息失败");
-            }
-            userNames = userNamesDTO.data;
-        }
-		
-		// 过滤字段
-		for (VersionDetail versionData : datas) {
-			VersionDetailDTO versionDTO = new VersionDetailDTO();
-			versionDTO.setId(versionData.getId());
-			//versionDTO.setCreator(versionData.getCreator());
-			versionDTO.setModifierid(userNames.get(versionData.getModifier()));
-			versionDTO.setDescription(versionData.getDescription());
-			versionDTO.setGmtCreate(versionData.getGmtCreate());
-			versionDTO.setOrderNo(versionData.getOrderNo());
-			versionDTO.setRemark(versionData.getRemark());
-			versionDTO.setStatus(versionData.getStatus());
-			versionDTO.setTitle(versionData.getTitle());
-			versionDTO.setVersionId(versionData.getVersionId());
-			dataNew.add(versionDTO);
-		}
-        return dataNew;
-
-    }
-
-    /**
-     * 更新接口
-     *
-     * @param versionDetailVO
-     * @return
-     */
-    public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
-        // 1.先判断数据是否存在有效
-    	checkExist(versionDetailVO.getDetailId());
-        // 2.修改版本详情信息
-        VersionDetail versionDetail = new VersionDetail();
-
-        versionDetail.setGmtModified(DateUtil.now());// 修改时间
-        versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-        versionDetail.setTitle(versionDetailVO.getTitle());
-        versionDetail.setOrderNo(versionDetailVO.getOrderNo());
-        versionDetail.setStatus(versionDetailVO.getStatus());
-        versionDetail.setId(versionDetailVO.getDetailId());
-        versionDetail.setDescription(versionDetailVO.getDescription());
-        versionDetail.setRemark(versionDetailVO.getRemark());
-        boolean res = updateById(versionDetail);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-        }
-
-        return res;
-    }
-
-    /**
-     * 删除接口
-     *
-     * @param versionDetailIdVO
-     * @return
-     */
-    public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionDetailIdVO.getId());
-        UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
-        versionDetailNew.in("id", versionDetailIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
-                IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID()).set("gmt_modified", DateUtil.now());
-        return update(new VersionDetail(), versionDetailNew);
-    }
-
-    /**
-     * 增加明细接口
-     *
-     * @param versionDetailIdVO
-     * @return
-     */
-    public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
-
-    	//1.增加明细前先判断主版本号的id是否有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoAndDetailIdVO.getVersionInfoId());
-        int sum = versionInfoServiceImpl.count(VersionInfoFand);
-        if (sum == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
-        }
-        
-        List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
-        List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
-        for (VersionDetailVO data : datas) {
-            VersionDetail versionDetail = new VersionDetail();
-            versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
-            versionDetail.setGmtCreate(DateUtil.now());
-            versionDetail.setGmtModified(DateUtil.now());
-            versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-            versionDetail.setDescription(data.getDescription());
-            versionDetail.setOrderNo(data.getOrderNo());
-            versionDetail.setTitle(data.getTitle());
-            versionDetail.setVersionId(versionInfoAndDetailIdVO.getVersionInfoId());
-            versionDetail.setRemark(data.getRemark());
-            versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-            dataNew.add(versionDetail);
-
-        }
-
-        boolean res = versionDetailServiceImpl.saveBatch(dataNew);
-
-        return res;
-    }
-    /**
-     * 判断数据是否存在有效
-     *
-     * @param id
-     */
-    private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
-    	 QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
-         VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-         int sum = count(VersionInfoFand);
-         if (sum == 0) {
-             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-         }
-    }
-}
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionDetailSpecDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailIdVO;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAndDetailIdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+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 2018年11月21日 上午11:38:40
+ */
+@Component
+public class VersionDetailFacade extends VersionDetailServiceImpl {
+
+    @Autowired
+    VersionDetailServiceImpl versionDetailServiceImpl;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    VersionInfoServiceImpl versionInfoServiceImpl;
+
+
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailDTO> getById(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .eq("version_id", id).orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        // System.out.println("List<VersionDetail>==="+datas.toString());
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        // 过滤字段
+        for (VersionDetail versionData : datas) {
+            VersionDetailDTO versionDTO = new VersionDetailDTO();
+            versionDTO.setId(versionData.getId());
+            //versionDTO.setCreator(versionData.getCreator());
+            versionDTO.setDescription(versionData.getDescription());
+            versionDTO.setGmtCreate(versionData.getGmtCreate());
+            versionDTO.setOrderNo(versionData.getOrderNo());
+            versionDTO.setRemark(versionData.getRemark());
+            versionDTO.setStatus(versionData.getStatus());
+            versionDTO.setTitle(versionData.getTitle());
+            versionDTO.setVersionId(versionData.getVersionId());
+            dataNew.add(versionDTO);
+        }
+        return dataNew;
+
+    }
+
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailSpecDTO> getById2(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("version_id", id);
+        mapAll.put("STATUS", StatusEnum.Enable.getKey());
+        versionDetailQuery.allEq(mapAll).orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        List<VersionDetailSpecDTO> dataNew = new ArrayList<>();
+        //过滤字段
+        dataNew = BeanUtil.listCopyTo(datas, VersionDetailSpecDTO.class);
+        return dataNew;
+
+    }
+
+    /**
+     * 根据版本ids查询版本详情
+     *
+     * @param ids
+     * @return
+     */
+    public List<VersionDetailDTO> getByIds(List<Long> ids) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .in("version_id", ids).orderByAsc("order_no");
+
+        List<VersionDetail> datas = list(versionDetailQuery);
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        List<String> modifierid = new ArrayList<>();
+        modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+        Map<String, String> userNames = new HashMap<>();
+        if (modifierid.size() > 0) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+
+        // 过滤字段
+        for (VersionDetail versionData : datas) {
+            VersionDetailDTO versionDTO = new VersionDetailDTO();
+            versionDTO.setId(versionData.getId());
+            //versionDTO.setCreator(versionData.getCreator());
+            versionDTO.setModifierid(userNames.get(versionData.getModifier()));
+            versionDTO.setDescription(versionData.getDescription());
+            versionDTO.setGmtCreate(versionData.getGmtCreate());
+            versionDTO.setOrderNo(versionData.getOrderNo());
+            versionDTO.setRemark(versionData.getRemark());
+            versionDTO.setStatus(versionData.getStatus());
+            versionDTO.setTitle(versionData.getTitle());
+            versionDTO.setVersionId(versionData.getVersionId());
+            dataNew.add(versionDTO);
+        }
+        return dataNew;
+
+    }
+
+    /**
+     * 更新接口
+     *
+     * @param versionDetailVO
+     * @return
+     */
+    public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
+        // 1.先判断数据是否存在有效
+        VersionDetail versionDetailres = checkExist(versionDetailVO.getDetailId());
+        //验证主表是否是可修改状态
+        checkExistMain(versionDetailres.getVersionId());
+        // 3.修改版本详情信息
+        VersionDetail versionDetail = new VersionDetail();
+
+        versionDetail.setGmtModified(DateUtil.now());// 修改时间
+        versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+        versionDetail.setTitle(versionDetailVO.getTitle());
+        versionDetail.setOrderNo(versionDetailVO.getOrderNo());
+        versionDetail.setStatus(versionDetailVO.getStatus());
+        versionDetail.setId(versionDetailVO.getDetailId());
+        versionDetail.setDescription(versionDetailVO.getDescription());
+        versionDetail.setRemark(versionDetailVO.getRemark());
+        boolean res = updateById(versionDetail);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除接口
+     *
+     * @param versionDetailIdVO
+     * @return
+     */
+    public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
+        // 1.先判断数据是否存在有效
+        VersionDetail versionDetailres = checkExist(versionDetailIdVO.getId());
+        //验证主表是否是可修改状态
+        checkExistMain(versionDetailres.getVersionId());
+        UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
+        versionDetailNew.in("id", versionDetailIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        return update(new VersionDetail(), versionDetailNew);
+    }
+
+    /**
+     * 增加明细接口
+     *
+     * @param versionInfoAndDetailIdVO
+     * @return
+     */
+    public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+
+        //1.增加明细前先判断主版本号的id是否有效
+        checkExistMain(versionInfoAndDetailIdVO.getVersionInfoId());
+
+        List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+        List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
+        for (VersionDetailVO data : datas) {
+            VersionDetail versionDetail = new VersionDetail();
+            versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+            versionDetail.setGmtCreate(DateUtil.now());
+            versionDetail.setGmtModified(DateUtil.now());
+            versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+            versionDetail.setDescription(data.getDescription());
+            versionDetail.setOrderNo(data.getOrderNo());
+            versionDetail.setTitle(data.getTitle());
+            versionDetail.setVersionId(versionInfoAndDetailIdVO.getVersionInfoId());
+            versionDetail.setRemark(data.getRemark());
+            versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+            dataNew.add(versionDetail);
+
+        }
+
+        boolean res = versionDetailServiceImpl.saveBatch(dataNew);
+
+        return res;
+    }
+
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private VersionDetail checkExist(Long id) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        VersionDetail versionDetail = getOne(VersionInfoFand);
+        if (null == versionDetail) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+        return versionDetail;
+    }
+
+
+    /**
+     * 判断数据是否存在有效(主版本)
+     *
+     * @param id
+     */
+    private void checkExistMain(Long id) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", id);
+        VersionInfo versionInfo = versionInfoServiceImpl.getOne(VersionInfoFand);
+        if (null == versionInfo) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");
+        }
+        if (StringUtil.isNotBlank(versionInfo.getStatus())
+                && versionInfo.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本已停用");
+        }
+    }
+}

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

@@ -1,248 +1,322 @@
-package com.diagbot.facade;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.RespDTO;
-import com.diagbot.dto.VersionDetailDTO;
-import com.diagbot.dto.VersionWrapperDTO;
-import com.diagbot.entity.VersionDetail;
-import com.diagbot.entity.VersionInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.VersionDetailServiceImpl;
-import com.diagbot.service.impl.VersionInfoServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.VersionDetailVO;
-import com.diagbot.vo.VersionInfoAllVO;
-import com.diagbot.vo.VersionInfoIdVO;
-import com.diagbot.vo.VersionInfoVO;
-import com.diagbot.vo.VersionWrapperNameVO;
-
-/**
- * @author wangfeng
- * @Description: 版本信息
- * @date 2018年12月6日 下午2:14:54
- */
-@Component
-public class VersionInfoFacade extends VersionInfoServiceImpl {
-
-    @Autowired
-    VersionDetailFacade versionDetailFacade;
-    @Autowired
-    VersionDetailServiceImpl versionDetailServiceImpl;
-    @Autowired
-    UserServiceClient userServiceClient;
-
-    /**
-     * 查询版本信息
-     *
-     * @return
-     */
-    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
-        // 模糊查询最新的一条版本信息
-       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .like("name", name).orderByDesc("refresh_time");
-      
-        // 分页查询
-*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
-        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
-        List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
-        // 取出操作人id
-        List<String> modifierid = new ArrayList<>();
-        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
-        // 根据操作人的id获取操作人信息
-        Map<String, String> userNames = new HashMap<>();
-        if (ListUtil.isNotEmpty(modifierid)) {
-            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-            }
-            userNames = userNamesDTO.data;
-        }
-        // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		for (VersionWrapperDTO versionInfo : versionInfos) {
-			VersionWrapperDTO versionList = new VersionWrapperDTO();
-			versionList.setId(versionInfo.getId());
-			versionList.setGmtCreate(versionInfo.getGmtCreate());
-			versionList.setName(versionInfo.getName());
-			versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
-			versionList.setRefreshTime(versionInfo.getRefreshTime());
-			versionList.setStatus(versionInfo.getStatus());
-			versionList.setRemark(versionInfo.getRemark());
-			versionLists.add(versionList);
-		}
-        // 取版本id查明细
-        List<Long> ids = new ArrayList<>();
-        if (versionInfos != null) {
-            // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-            for (VersionWrapperDTO versionInfo : versionInfos) {
-                ids.add(versionInfo.getId());
-            }
-            // 获取明细信息
-            List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
-            Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
-            // 获取所有用户开通的产品信息
-            map = EntityUtil.makeEntityListMap(details, "versionId");
-            if (map.size() > 0) {
-                for (VersionWrapperDTO versionList : versionLists) {
-                    List<VersionDetailDTO> userAndProdutUDTO = map.get(versionList.getId());
-                    if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
-                        versionList.setDetail(userAndProdutUDTO);
-                    }
-                }
-            }
-        }
-        return queryUserInformation.setRecords(versionLists);
-
-    }
-
-    /**
-     * 保存版本信息
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
-        // 1.判断该版本号是否存在名字相同的数据
-        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
-        VersionInfo dataInfo = getOne(templateInfoFand);
-        if (dataInfo != null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
-        }
-
-        // 增加版本数据
-        VersionInfo versionInfo = new VersionInfo();
-        versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
-        versionInfo.setGmtCreate(DateUtil.now());
-        versionInfo.setName(versionInfoVO.getName());
-        versionInfo.setGmtModified(DateUtil.now());
-        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        try {
-            versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
-        } catch (ParseException e) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-        }
-        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-        versionInfo.setRemark(versionInfoVO.getRemark());
-        // 优先保存版本号，成功后再保存明细信息
-        boolean res = save(versionInfo);
-        if (res) {
-            List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
-            List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
-            if (datas != null && datas.size() > 0) {
-                for (VersionDetailVO data : datas) {
-                    VersionDetail versionDetail = new VersionDetail();
-                    versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
-                    versionDetail.setGmtCreate(DateUtil.now());
-                    versionDetail.setGmtModified(DateUtil.now());
-                    versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-                    versionDetail.setDescription(data.getDescription());
-                    versionDetail.setOrderNo(data.getOrderNo());
-                    versionDetail.setTitle(data.getTitle());
-                    versionDetail.setVersionId(versionInfo.getId());
-                    versionDetail.setRemark(data.getRemark());
-                    versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-                    dataNew.add(versionDetail);
-                }
-
-                res = versionDetailServiceImpl.saveBatch(dataNew);
-            }
-        }
-        return res;
-    }
-
-    /**
-     * 更新
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
-        // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
-        // 2.判断该版本号是否存在名字相同的数据
-        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
-        VersionInfo dataInfo = getOne(templateInfoFand);
-        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
-        }
-        // 3.修改版本信息
-        VersionInfo versionInfo = new VersionInfo();
-        versionInfo.setId(versionInfoVO.getId());// 模板id
-        versionInfo.setName(versionInfoVO.getName());// 模板名称
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (versionInfoVO.getRefreshTime() != null) {
-            try {
-                versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
-            } catch (ParseException e) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-                // e.printStackTrace();
-            }
-        }
-        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-        versionInfo.setRemark(versionInfoVO.getRemark());
-        versionInfo.setGmtModified(DateUtil.now());// 修改时间
-        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
-        boolean res = updateById(versionInfo);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-        }
-
-        return res;
-    }
-
-    /**
-     * 删除
-     *
-     * @param versionInfoVO
-     * @return
-     */
-    public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
-    	 // 1.先判断数据是否存在有效
-    	checkExist(versionInfoVO.getId());
-        UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
-        versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-                .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now());
-        return update(new VersionInfo(), versionInfoNew);
-    }
-
-    /**
-     * 判断数据是否存在有效
-     *
-     * @param id
-     */
-    private void checkExist(Long id) {
-    	 // 1.先判断数据是否存在有效
-        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
-        int sum = count(VersionInfoFand);
-        if (sum == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
-        }
-    }
-}
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionDetailSpecDTO;
+import com.diagbot.dto.VersionSpecDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.IntegerUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAllVO;
+import com.diagbot.vo.VersionInfoIdVO;
+import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionVO;
+import com.diagbot.vo.VersionWrapperNameVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年12月6日 下午2:14:54
+ */
+@Component
+public class VersionInfoFacade extends VersionInfoServiceImpl {
+
+    @Autowired
+    VersionDetailFacade versionDetailFacade;
+    @Autowired
+    VersionDetailServiceImpl versionDetailServiceImpl;
+    @Autowired
+    UserServiceClient userServiceClient;
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page, VersionWrapperNameVO versionWrapperNameVO) {
+        // 模糊查询最新的一条版本信息
+       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .like("name", name).orderByDesc("refresh_time");
+      
+        // 分页查询
+*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page, versionWrapperNameVO);
+        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
+        List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
+        // 取出操作人id
+        List<String> modifierid = new ArrayList<>();
+        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
+        // 根据操作人的id获取操作人信息
+        Map<String, String> userNames = new HashMap<>();
+        if (ListUtil.isNotEmpty(modifierid)) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+        // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+        for (VersionWrapperDTO versionInfo : versionInfos) {
+            VersionWrapperDTO versionList = new VersionWrapperDTO();
+            versionList.setId(versionInfo.getId());
+            versionList.setGmtCreate(versionInfo.getGmtCreate());
+            versionList.setProductType(versionInfo.getProductType());
+            versionList.setProductTypeName(ProductTypeEnum.getName(versionInfo.getProductType()));
+            versionList.setName(versionInfo.getName());
+            versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
+            versionList.setRefreshTime(versionInfo.getRefreshTime());
+            versionList.setStatus(versionInfo.getStatus());
+            versionList.setRemark(versionInfo.getRemark());
+            versionLists.add(versionList);
+        }
+        // 取版本id查明细
+        List<Long> ids = new ArrayList<>();
+        if (versionInfos != null) {
+            // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            for (VersionWrapperDTO versionInfo : versionInfos) {
+                ids.add(versionInfo.getId());
+            }
+            // 获取明细信息
+            List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
+            Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
+            // 获取所有用户开通的产品信息
+            map = EntityUtil.makeEntityListMap(details, "versionId");
+            if (map.size() > 0) {
+                for (VersionWrapperDTO versionList : versionLists) {
+                    List<VersionDetailDTO> userAndProdutUDTO = map.get(versionList.getId());
+                    if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
+                        versionList.setDetail(userAndProdutUDTO);
+                    }
+                }
+            }
+        }
+        return queryUserInformation.setRecords(versionLists);
+
+    }
+
+    /**
+     * 保存版本信息
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
+        // 1.判断摸个产品该版本号是否存在名字相同的数据
+        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+        templateInfoFand.eq("product_type", versionInfoVO.getProductType())
+                .eq("name", versionInfoVO.getName())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
+
+        VersionInfo dataInfo = getOne(templateInfoFand);
+        if (dataInfo != null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
+        }
+        //2.把相同产品类型的版本状态修改为0，
+        UpdateWrapper<VersionInfo> versionInfoUp = new UpdateWrapper<>();
+        versionInfoUp.eq("product_type", versionInfoVO.getProductType())
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("status", StatusEnum.Disable.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        update(new VersionInfo(), versionInfoUp);
+
+        //3.增加版本数据
+        VersionInfo versionInfo = new VersionInfo();
+        versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
+        versionInfo.setGmtCreate(DateUtil.now());
+        versionInfo.setProductType(versionInfoVO.getProductType());
+        versionInfo.setName(versionInfoVO.getName());
+        versionInfo.setGmtModified(DateUtil.now());
+        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+        } catch (ParseException e) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+        }
+        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        versionInfo.setRemark(versionInfoVO.getRemark());
+        // 优先保存版本号，成功后再保存明细信息
+        boolean res = save(versionInfo);
+        if (res) {
+            List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+            List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
+            if (datas != null && datas.size() > 0) {
+                for (VersionDetailVO data : datas) {
+                    VersionDetail versionDetail = new VersionDetail();
+                    versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+                    versionDetail.setGmtCreate(DateUtil.now());
+                    versionDetail.setGmtModified(DateUtil.now());
+                    versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+                    versionDetail.setDescription(data.getDescription());
+                    versionDetail.setOrderNo(data.getOrderNo());
+                    versionDetail.setTitle(data.getTitle());
+                    versionDetail.setVersionId(versionInfo.getId());
+                    versionDetail.setRemark(data.getRemark());
+                    versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+                    dataNew.add(versionDetail);
+                }
+
+                res = versionDetailServiceImpl.saveBatch(dataNew);
+            }
+        }
+        return res;
+    }
+
+    /**
+     * 更新
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
+        // 1.先判断数据是否存在有效
+        VersionInfo versionInfoRes = checkExist(versionInfoVO.getId());
+        //验证是否停用
+        if (versionInfoRes != null
+                && StringUtil.isNotBlank(versionInfoRes.getStatus())
+                && versionInfoRes.getStatus().equals(String.valueOf(StatusEnum.Disable.getKey()))) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已停用");
+        }
+        // 2.判断该版本号是否存在名字相同的数据
+        QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+        templateInfoFand.eq("product_type", versionInfoVO.getProductType())
+                .eq("name", versionInfoVO.getName())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
+
+        VersionInfo dataInfo = getOne(templateInfoFand);
+        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该产品该版本号已存在");
+        }
+        // 3.修改版本信息
+        VersionInfo versionInfo = new VersionInfo();
+        versionInfo.setId(versionInfoVO.getId());// 模板id
+        versionInfo.setProductType(versionInfoVO.getProductType());
+        versionInfo.setName(versionInfoVO.getName());// 模板名称
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if (versionInfoVO.getRefreshTime() != null) {
+            try {
+                versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+            } catch (ParseException e) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+                // e.printStackTrace();
+            }
+        }
+        versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        versionInfo.setRemark(versionInfoVO.getRemark());
+        versionInfo.setGmtModified(DateUtil.now());// 修改时间
+        versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+        boolean res = updateById(versionInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除
+     *
+     * @param versionInfoVO
+     * @return
+     */
+    public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
+        // 1.先判断数据是否存在有效
+        checkExist(versionInfoVO.getId());
+        UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
+        versionInfoNew.in("id", versionInfoVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        return update(new VersionInfo(), versionInfoNew);
+    }
+
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private VersionInfo checkExist(Long id) {
+        // 1.先判断数据是否存在有效
+        QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", id);
+        VersionInfo versionInfo = getOne(VersionInfoFand);
+        if (null == versionInfo) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+        return versionInfo;
+    }
+
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionSpecDTO getVersionInfo(VersionVO versionVO) {
+        //入参配置验证
+        if (null == versionVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
+
+        if (IntegerUtil.isNull(versionVO.getProductType())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "产品类型不能为空！");
+        }
+        //查询最新的一条版本信息
+        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("product_type", versionVO.getProductType())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByDesc("gmt_modified");
+
+        VersionInfo versionInfo = getOne(versionInfoQuery);
+        VersionSpecDTO versionList = new VersionSpecDTO();
+
+        if (versionInfo != null) {
+            //当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+            long id = versionInfo.getId();
+            List<VersionDetailSpecDTO> detail = versionDetailFacade.getById2(id);
+            //System.out.println(detail.toString());
+            versionList.setId(versionInfo.getId());
+            versionList.setName(versionInfo.getName());
+            versionList.setRefreshTime(versionInfo.getRefreshTime());
+            versionList.setStatus(versionInfo.getStatus());
+            versionList.setDetail(detail);
+        }
+
+        return versionList;
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/RelationMapper.java

@@ -8,14 +8,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetRelationInfoListDTO;
 import com.diagbot.dto.LisSonContactListDTO;
-import com.diagbot.dto.MultContactListDTO;
-import com.diagbot.dto.RelationContactListDTO;
+import com.diagbot.dto.OnlyByRootListDTO;
 import com.diagbot.dto.RelationNodeDTO;
+import com.diagbot.dto.SingleRelationListDTO;
 import com.diagbot.entity.Relation;
 import com.diagbot.vo.GetRelationInfoListVO;
 import com.diagbot.vo.LisSonContactListVO;
-import com.diagbot.vo.MultContactListVO;
-import com.diagbot.vo.RelationContactListVO;
+import com.diagbot.vo.OnlyByRootListVO;
+import com.diagbot.vo.SingleRelationListVO;
 
 /**
  * <p>
@@ -29,12 +29,27 @@ public interface RelationMapper extends BaseMapper<Relation> {
 	
 	IPage<GetRelationInfoListDTO> getRelationInfoList(GetRelationInfoListVO getRelationInfoListVO);
 	
-	List<RelationNodeDTO> getRelationNodeDTOs(@Param(value="conceptId")Long conceptId,@Param(value="relationId")Long relationId);
+	List<RelationNodeDTO> getRelationNodeDTOs(@Param(value="conceptId")Long conceptId,@Param(value="relationId")Long relationId,@Param(value="endTypeId")Long endTypeId);
 	
-	IPage<RelationContactListDTO> relationContactList(RelationContactListVO relationContactListVO);
+	/**
+	 * 化验子项分页查询
+	 * @param lisSonContactListVO
+	 * @return
+	 */
+	IPage<LisSonContactListDTO> lisSonContactList(LisSonContactListVO lisSonContactListVO);
 	
-	IPage<MultContactListDTO> multContactList(MultContactListVO multContactListVO);
+	/**
+	 * 起始术语类型id、终点术语类型id、关系类型id
+	 * @param singleRelationListVO
+	 * @return
+	 */
+	IPage<SingleRelationListDTO> singleRelationList(SingleRelationListVO singleRelationListVO);
 	
-	IPage<LisSonContactListDTO> lisSonContactList(LisSonContactListVO lisSonContactListVO);
+	/**
+	 * 根节点术语类型id集合(起始术语类型id集合)、关系类型id
+	 * @param onlyByRootListVO
+	 * @return
+	 */
+	IPage<OnlyByRootListDTO> onlyByRootList(OnlyByRootListVO onlyByRootListVO);
 	
 }

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -8,6 +8,8 @@ import com.diagbot.enums.HasQuestionEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.PositionTypeEnum;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.enums.RelationModelTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
 import org.springframework.stereotype.Service;
@@ -35,7 +37,21 @@ public class EnumsDataServiceImpl implements EnumsDataService {
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
                 .addEnums("lexiconRSTypeEnum", LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
                 .addEnums("lexiconTypeEnum", LexiconTypeEnum.values())
-                .addEnums("concatLexiconTypeEnum", 
+                .addEnums("productTypeEnum", ProductTypeEnum.values())
+                .addEnums("concatLexiconTypeEnum",
+                        LexiconTypeEnum.SYMPTOM, LexiconTypeEnum.BODYPART,
+                        LexiconTypeEnum.LIS_PACKAGE, LexiconTypeEnum.PACS_PACKAGE,
+                        LexiconTypeEnum.PACS_ITEMS, LexiconTypeEnum.DIAGNOSIS,
+                        LexiconTypeEnum.PACS_CATEGORY_BIG, LexiconTypeEnum.PACS_CATEGORY_SMALL,
+                        LexiconTypeEnum.DEPARTMENT, LexiconTypeEnum.GAUGE,
+                        LexiconTypeEnum.SIDE_EFFECTS, LexiconTypeEnum.CORE_INDICATORS,
+                        LexiconTypeEnum.LIS_TABLES)
+                .addEnums("conceptDetailLexiconTypeEnum",
+                        LexiconTypeEnum.DIAGNOSIS, LexiconTypeEnum.LIS_TABLES,
+                        LexiconTypeEnum.PACS_ITEMS, LexiconTypeEnum.DRUGS,
+                        LexiconTypeEnum.SIDE_EFFECTS)
+                .addEnums("relationModelTypeEnum", RelationModelTypeEnum.values())
+                .addEnums("concatLexiconTypeEnum",
                 		LexiconTypeEnum.SYMPTOM,LexiconTypeEnum.BODYPART,LexiconTypeEnum.LIS_PACKAGE,LexiconTypeEnum.PACS_PACKAGE,
                 		LexiconTypeEnum.PACS_ITEMS,LexiconTypeEnum.DIAGNOSIS,LexiconTypeEnum.PACS_CATEGORY_BIG,LexiconTypeEnum.PACS_CATEGORY_SMALL,
                 		LexiconTypeEnum.DEPARTMENT,LexiconTypeEnum.GAUGE,LexiconTypeEnum.SIDE_EFFECTS,LexiconTypeEnum.CORE_INDICATORS,

knowledgeman-service/src/main/java/com/diagbot/vo/DeleteRelationContactVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@Getter
+@Setter
+public class DeleteRelationContactVO {
+    
+    /**
+     * 概念id
+     */
+	@ApiModelProperty(value="概念id",required=true)
+	@NotNull(message="概念id必传")
+    private Long conceptId;
+	
+	/**
+	 * 各级关系类型id集合
+	 */
+	@ApiModelProperty(value="各级关系类型id集合")
+	private List<Long> relationIds;
+	
+	/**
+	 * 各级终点术语类型id集合
+	 */
+	@ApiModelProperty(value="各级终点术语类型id集合")
+	private List<Long> typeIds;
+	
+    
+}

knowledgeman-service/src/main/java/com/diagbot/vo/GetAllForRelationVO.java

@@ -39,6 +39,12 @@ public class GetAllForRelationVO {
     @ApiModelProperty(value="相关联的概念id")
     private Long relationConceptId;
     
+    /**
+     * 相关联的概念类型
+     */
+    @ApiModelProperty(value="相关联的概念类型")
+    private Long relationTypeId;
+    
     /**
      * 关系类型id
      */

knowledgeman-service/src/main/java/com/diagbot/vo/GetConceptDetailListVO.java

@@ -21,6 +21,12 @@ public class GetConceptDetailListVO extends Page {
      */
 	@ApiModelProperty(value="术语名称")
     private String conceptName;
+	
+	/**
+     * 术语类型id
+     */
+	@ApiModelProperty(value="术语类型id")
+    private Long libType;
 
 
 	@ApiModelProperty(value = "状态值,已删除=Y，启用中=N")

knowledgeman-service/src/main/java/com/diagbot/vo/MultContactListVO.java

@@ -1,38 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/3/14 16:03
- */
-@SuppressWarnings({ "serial", "rawtypes" })
-@Getter
-@Setter
-public class MultContactListVO extends Page {
-    
-    /**
-     * 术语名称
-     */
-    @ApiModelProperty(value="术语名称")
-    private String name;
-
-    /**
-     * 术语类型
-     */
-    @ApiModelProperty(value="术语类型")
-    private String type;
-	
-	/**
-	 * 非前端传参，后台查询时临时使用
-	 */
-	private List<Long> rootNodeConceptIds;
-    
-}

knowledgeman-service/src/main/java/com/diagbot/vo/OnlyByRootListVO.java

@@ -0,0 +1,46 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@SuppressWarnings({ "serial", "rawtypes" })
+@Getter
+@Setter
+public class OnlyByRootListVO extends Page {
+    
+    /**
+     * 标准术语名称
+     */
+    @ApiModelProperty(value="标准术语名称")
+    private String name;
+    
+    /**
+     * 根节点术语类型id集合(起始术语类型id集合)
+     */
+    @NotEmpty(message="根节点术语类型id集合(起始术语类型id集合)必传")
+    @ApiModelProperty(value="根节点术语类型id集合(起始术语类型id集合)")
+    private List<Long> startTypeIds;
+    
+    /**
+     * 关系类型id
+     */
+    @NotNull(message="关系类型id必传")
+    @ApiModelProperty(value="关系类型id")
+    private Long relationId;
+
+    
+    
+}

knowledgeman-service/src/main/java/com/diagbot/vo/RelationContactDetailVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import java.util.List;
+
 import javax.validation.constraints.NotNull;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -23,9 +25,15 @@ public class RelationContactDetailVO {
     private Long conceptId;
 	
 	/**
-	 * 关系id
+	 * 各级关系类型id集合
+	 */
+	@ApiModelProperty(value="各级关系类型id集合")
+	private List<Long> relationIds;
+	
+	/**
+	 * 各级终点术语类型id集合
 	 */
-	@ApiModelProperty(value="关系id")
-	private Long relationId;
+	@ApiModelProperty(value="各级终点术语类型id集合")
+	private List<Long> typeIds;
     
 }

knowledgeman-service/src/main/java/com/diagbot/vo/RelationContactListVO.java

@@ -1,37 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/3/14 16:03
- */
-@SuppressWarnings({ "serial", "rawtypes" })
-@Getter
-@Setter
-public class RelationContactListVO extends Page {
-    
-    /**
-     * 术语名称
-     */
-    @ApiModelProperty(value="术语名称")
-    private String name;
-
-    /**
-     * 术语类型
-     */
-    @ApiModelProperty(value="术语类型")
-    private String type;
-    
-    /**
-     * 状态：Y-已删除，N-启用中
-     */
-	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
-	private String isDeleted;
-    
-}

knowledgeman-service/src/main/java/com/diagbot/vo/RelationNodeVO.java

@@ -19,10 +19,10 @@ public class RelationNodeVO {
 	 */
 	private Long conceptId;
 	
-//	/**
-//	 * 上一级概念id end_id
-//	 */
-//	private Long parentConceptId;
+	/**
+	 * 下一级概念类型id
+	 */
+	private Long sonTypeId;
 	
 	/**
 	 * 当前概念(起点术语) 与 上一级概念(终点术语) 关系id

knowledgeman-service/src/main/java/com/diagbot/vo/SingleRelationListVO.java

@@ -0,0 +1,56 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@SuppressWarnings({ "serial", "rawtypes" })
+@Getter
+@Setter
+public class SingleRelationListVO extends Page {
+    
+    /**
+     * 标准术语名称
+     */
+    @ApiModelProperty(value="标准术语名称")
+    private String name;
+    
+    /**
+     * 关系模块类型编码：科室常用、化验常用、辅检常用、诊断关联量表
+     */
+    @NotBlank(message="关系模块类型编码必传")
+    @ApiModelProperty(value="关系模块类型编码：科室常用、化验常用、辅检常用、诊断关联量表")
+    private String relationModelTypeCode;
+
+    /**
+     * 起始术语类型id
+     */
+    @ApiModelProperty(value="起始术语类型id")
+    private Long startTypeId;
+    
+    /**
+     * 终点术语类型id
+     */
+    @ApiModelProperty(value="终点术语类型id")
+    private Long endTypeId;
+    
+    /**
+     * 关系类型id
+     */
+    @NotNull(message="关系类型id必传")
+    @ApiModelProperty(value="关系类型id")
+    private Long relationId;
+    
+    
+    
+}

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

@@ -1,21 +1,19 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 删除版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:33
- */
-@Getter
-@Setter
-public class VersionDetailIdVO {
-	@NotNull(message = "请输入id")
-	private Long id;
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 删除版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:33
+ */
+@Getter
+@Setter
+public class VersionDetailIdVO {
+	@NotNull(message = "请输入id")
+	private Long id;
+}

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

@@ -1,48 +1,47 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 更新版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月27日 上午10:20:56
- */
-@Getter
-@Setter
-public class VersionDetailVO {
-
-	   /**
-     * 版本主表id
-     */
-	@NotNull(message = "请输入id")
-    private Long detailId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 更新版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 上午10:20:56
+ */
+@Getter
+@Setter
+public class VersionDetailVO {
+	   /**
+     * 版本主表id
+     */
+	@NotNull(message = "请输入id")
+    private Long detailId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -1,44 +1,48 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 更新版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月29日 下午4:01:30
- */
-@Getter
-@Setter
-public class VersionInfoAllVO {
-	/**
-	 * 版本id
-	 */
-	@NotNull(message = "请输入id")
-	private Long id;
-	/**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 时间
-     */
-    private String refreshTime;
-
-    /**
-     * 1：启动，0：不启用
-     */
-   // private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 更新版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月29日 下午4:01:30
+ */
+@Getter
+@Setter
+public class VersionInfoAllVO {
+	/**
+	 * 版本id
+	 */
+	@NotNull(message = "请输入id")
+	private Long id;
+
+	/**
+	 * 产品类型
+	 */
+	@NotNull(message = "产品类型不能为空")
+	private Integer productType;
+
+	/**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 时间
+     */
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -1,26 +1,26 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 增加版本详情信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:41
- */
-@Getter
-@Setter
-public class VersionInfoAndDetailIdVO {
-	/**
-	 * 用户id
-	 */
-	@NotNull(message = "请输入id")
-	private Long versionInfoId;
-	
-    private List<VersionDetailVO> versionDetail;
-}
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 增加版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:41
+ */
+@Getter
+@Setter
+public class VersionInfoAndDetailIdVO {
+	/**
+	 * 用户id
+	 */
+	@NotNull(message = "请输入id")
+	private Long versionInfoId;
+	
+    private List<VersionDetailVO> versionDetail;
+}

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

@@ -1,19 +1,19 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 删除版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:35:02
- */
-@Getter
-@Setter
-public class VersionInfoIdVO {
-	@NotNull(message = "请输入id")
-	private Long id;
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 删除版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:02
+ */
+@Getter
+@Setter
+public class VersionInfoIdVO {
+	@NotNull(message = "请输入id")
+	private Long id;
+}

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

@@ -1,49 +1,54 @@
-package com.diagbot.vo;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.validation.constraints.NotBlank;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * 保存版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月28日 上午10:55:17
- */
-@Getter
-@Setter
-public class VersionInfoVO {
-
-	/**
-	 * 用户id
-	 */
-	//private Long id;
-	/**
-     * 名称
-     */
-	@NotBlank(message = "标题不能为空")
-    private String name;
-
-    /**
-     * 时间
-     */
-	@NotBlank(message = "请输入时间")
-    private String refreshTime;
-
-    /**
-     * 1：启动，0：不启用
-     */
-   // private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-    
-    private List<VersionDetailVO> versionDetail;
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 
+ * 保存版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月28日 上午10:55:17
+ */
+@Getter
+@Setter
+public class VersionInfoVO {
+
+	/**
+	 * 用户id
+	 */
+	//private Long id;
+    /**
+     * 产品类型
+     */
+    @NotNull(message = "产品类型不能为空")
+    private Integer productType;
+
+	/**
+     * 名称
+     */
+	@NotBlank(message = "标题不能为空")
+    private String name;
+
+    /**
+     * 时间
+     */
+	@NotBlank(message = "请输入时间")
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    
+    private List<VersionDetailVO> versionDetail;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

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

@@ -1,21 +1,27 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 获取版本信息
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:34:35
- */
-@Getter
-@Setter
-public class VersionWrapperNameVO extends Page{
-	/**
-     * 名称
-     */
-    private String name;
-}
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 获取版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:34:35
+ */
+@Getter
+@Setter
+public class VersionWrapperNameVO extends Page{
+
+    /**
+     * 产品类型
+     */
+    private Integer productType;
+
+	/**
+     * 名称
+     */
+    private String name;
+}

knowledgeman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
-
 /**
  * @author wangfeng
  * @Description: 免责申明详情 前端控制器

knowledgeman-service/src/main/java/com/diagbot/web/EvaluationController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DiseaseInfoDTO;

knowledgeman-service/src/main/java/com/diagbot/web/MultContactController.java

@@ -1,26 +1,28 @@
 package com.diagbot.web;
 
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.MultContactListDTO;
+import com.diagbot.dto.OnlyByRootListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MultContactFacade;
 import com.diagbot.facade.RelationContactFacade;
-import com.diagbot.vo.MultContactListVO;
+import com.diagbot.vo.DeleteRelationContactVO;
+import com.diagbot.vo.OnlyByRootListVO;
 import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationNodeVO;
-import com.diagbot.vo.RemoveRelationContactVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
 
 /**
  * <p>
@@ -44,8 +46,8 @@ public class MultContactController {
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-列表[by:rengb]")
     @PostMapping("/multContactList")
     @SysLogger("multContactList")
-    public RespDTO<IPage<MultContactListDTO>> multContactList(@RequestBody MultContactListVO multContactListVO) {
-        return RespDTO.onSuc(multContactFacade.multContactList(multContactListVO));
+    public RespDTO<IPage<OnlyByRootListDTO>> multContactList(@Valid @RequestBody OnlyByRootListVO onlyByRootListVO) {
+        return RespDTO.onSuc(multContactFacade.multContactList(onlyByRootListVO));
     }
 
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-添加或者编辑[by:rengb]")
@@ -67,8 +69,8 @@ public class MultContactController {
     @PostMapping("/removeRelationContact")
     @SysLogger("removeRelationContact")
     @Transactional
-    public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody RemoveRelationContactVO removeRelationContactVO) {
-        return RespDTO.onSuc(relationContactFacade.deleteRelationContact(removeRelationContactVO));
+    public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody DeleteRelationContactVO deleteRelationContactVO) {
+        return RespDTO.onSuc(relationContactFacade.deleteRelationContact(deleteRelationContactVO));
     }
 
 }

knowledgeman-service/src/main/java/com/diagbot/web/RelationContactController.java

@@ -1,25 +1,27 @@
 package com.diagbot.web;
 
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RelationContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SingleRelationListDTO;
 import com.diagbot.facade.RelationContactFacade;
+import com.diagbot.vo.DeleteRelationContactVO;
 import com.diagbot.vo.RelationContactDetailVO;
-import com.diagbot.vo.RelationContactListVO;
 import com.diagbot.vo.RelationNodeVO;
-import com.diagbot.vo.RemoveRelationContactVO;
+import com.diagbot.vo.SingleRelationListVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
 
 /**
  * <p>
@@ -41,8 +43,8 @@ public class RelationContactController {
     @ApiOperation(value = "医学术语关联维护-列表[by:rengb]")
     @PostMapping("/relationContactList")
     @SysLogger("relationContactList")
-    public RespDTO<IPage<RelationContactListDTO>> relationContactList(@RequestBody RelationContactListVO relationContactListVO) {
-        return RespDTO.onSuc(relationContactFacade.relationContactList(relationContactListVO));
+    public RespDTO<IPage<SingleRelationListDTO>> relationContactList(@Valid @RequestBody SingleRelationListVO singleRelationListVO) {
+        return RespDTO.onSuc(relationContactFacade.relationContactList(singleRelationListVO));
     }
 
     @ApiOperation(value = "知识库标准化-医学术语关联维护-添加或者编辑[by:rengb]")
@@ -64,8 +66,8 @@ public class RelationContactController {
     @PostMapping("/removeRelationContact")
     @SysLogger("removeRelationContact")
     @Transactional
-    public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody RemoveRelationContactVO removeRelationContactVO) {
-        return RespDTO.onSuc(relationContactFacade.deleteRelationContact(removeRelationContactVO));
+    public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody DeleteRelationContactVO deleteRelationContactVO) {
+        return RespDTO.onSuc(relationContactFacade.deleteRelationContact(deleteRelationContactVO));
     }
 
 }

knowledgeman-service/src/main/java/com/diagbot/web/ScaleContentController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;

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

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -44,9 +43,7 @@ public class VersionDetailController {
     @SysLogger("updateVersionDetails")
     @Transactional
     public RespDTO<Boolean> updateVersionDetails(@Valid @RequestBody VersionDetailVO versionDetailVO) {
-
         boolean res = versionDetailFacade.updateVersionDetail(versionDetailVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -55,9 +52,7 @@ public class VersionDetailController {
     @SysLogger("cancelVersionDetails")
     @Transactional
     public RespDTO<Boolean> cancelVersionDetails(@Valid @RequestBody VersionDetailIdVO versionDetailIdVO) {
-
         boolean res = versionDetailFacade.cancelVersionDetail(versionDetailIdVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -66,9 +61,7 @@ public class VersionDetailController {
     @SysLogger("addVersionDetails")
     @Transactional
     public RespDTO<Boolean> addVersionDetails(@Valid @RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
-
         boolean res = versionDetailFacade.addVersionDetail(versionInfoAndDetailIdVO);
-
         return RespDTO.onSuc(res);
     }
     @ApiOperation(value = "根据版本id获取版本详情信息[by:wangfeng]", notes = "根据版本id获取版本详情信息")
@@ -79,7 +72,6 @@ public class VersionDetailController {
     	List<Long> ids = new ArrayList<>();
     	ids.add(versionInfoIdVO.getId());
     	List<VersionDetailDTO> data = versionDetailFacade.getByIds(ids);
-
         return RespDTO.onSuc(data);
     }
 }

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

@@ -3,11 +3,14 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionSpecDTO;
 import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.facade.VersionInfoFacade;
 import com.diagbot.vo.VersionInfoAllVO;
 import com.diagbot.vo.VersionInfoIdVO;
 import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionVO;
 import com.diagbot.vo.VersionWrapperNameVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author wangfeng
@@ -40,9 +42,8 @@ public class VersionInfoController {
     @SysLogger("getVersionInfoAlls")
     @Transactional
     public RespDTO<IPage<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
-
-    	IPage<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO);
-
+        IPage<VersionWrapperDTO> data
+                = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO);
         return RespDTO.onSuc(data);
     }
 
@@ -51,9 +52,7 @@ public class VersionInfoController {
     @SysLogger("saveVersionInfoAlls")
     @Transactional
     public RespDTO<Boolean> saveVersionInfoAlls(@Valid @RequestBody VersionInfoVO versionInfoVO) {
-
         boolean res = versionInfoFacade.saveVersionInfoAll(versionInfoVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -62,9 +61,7 @@ public class VersionInfoController {
     @SysLogger("updateVersionInfoAlls")
     @Transactional
     public RespDTO<Boolean> updateVersionInfoAlls(@Valid @RequestBody VersionInfoAllVO versionInfoVO) {
-
         boolean res = versionInfoFacade.updateVersionInfoAll(versionInfoVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -73,9 +70,27 @@ public class VersionInfoController {
     @SysLogger("cancelVersionInfoAlls")
     @Transactional
     public RespDTO<Boolean> cancelVersionInfoAlls(@Valid @RequestBody VersionInfoIdVO versionInfoVO) {
-
         boolean res = versionInfoFacade.cancelVersionInfoAll(versionInfoVO);
-
         return RespDTO.onSuc(res);
     }
+
+    @ApiOperation(value = "获取内部用户版本信息[by:wangfeng]", notes = "获取内部用户版本信息")
+    @PostMapping("/getVersionInfoInner")
+    @SysLogger("getVersionInfoInner")
+    public RespDTO<VersionSpecDTO> getVersionInfoInner() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.DIAGBOTCLOUD_INNER.getKey());
+        VersionSpecDTO data = versionInfoFacade.getVersionInfo(versionVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "获取外部用户版本信息[by:wangfeng]", notes = "获取外部用户版本信息")
+    @PostMapping("/getVersionInfoOuter")
+    @SysLogger("getVersionInfoOuter")
+    public RespDTO<VersionSpecDTO> getVersionInfoOuter() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.DIAGBOTCLOUD_OUTER.getKey());
+        VersionSpecDTO data = versionInfoFacade.getVersionInfo(versionVO);
+        return RespDTO.onSuc(data);
+    }
 }

knowledgeman-service/src/main/resources/mapper/ConceptDetailMapper.xml

@@ -29,6 +29,9 @@
 		<if test="status!=null and status!=''">
 			and a.is_deleted = #{status}
 		</if>
+		<if test="libType!=null">
+			and b.lib_type=#{libType}
+		</if>
         group by a.concept_id
         ORDER BY a.is_deleted ASC, a.gmt_modified DESC
    	</select>

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -74,139 +74,106 @@
  		<if test="relationId!=null">
  			AND a.relation_id=#{relationId}
  		</if>
+ 		<if test="endTypeId!=null">
+ 			AND d.lib_type=#{endTypeId}
+ 		</if>
 		ORDER BY b.order_no ASC,a.gmt_modified DESC
     </select>
     
-    <select id="relationContactList" resultType="com.diagbot.dto.RelationContactListDTO">
+    <select id="lisSonContactList" resultType="com.diagbot.dto.LisSonContactListDTO">
     	SELECT
 			*
 		FROM
-		(SELECT
+		(SELECT  
 		t2.id AS conceptId,
 		t2.lib_name AS libName,
 		t4.name AS libType,
 		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no ASC,t1.gmt_modified DESC) AS otherNames,
+		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
 		t1.is_deleted AS isDeleted
-		FROM
-		(SELECT
-		a.*
-		FROM
-		(SELECT * FROM kl_relation WHERE relation_id=17) a
-		LEFT JOIN (SELECT start_id FROM kl_relation WHERE relation_id=17) b
-		ON a.end_id=b.start_id
-		LEFT JOIN (SELECT end_id FROM kl_relation WHERE relation_id=17) c
-		ON a.start_id=c.end_id
-		WHERE b.start_id IS NULL AND c.end_id IS NULL) t1
+		FROM kl_relation t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
-		JOIN kl_lexicon t4 ON t2.lib_type=t4.id
+		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
 		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
-		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
+		WHERE t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
+		AND t1.relation_id=18
 		GROUP BY t2.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
-			and libNameType like concat('%',#{name},'%')
+			and libName like concat('%',#{name},'%')
 		</if>
 		ORDER BY isDeleted ASC,operTime DESC
     </select>
     
-    <!-- <select id="multContactList" resultType="com.diagbot.dto.MultContactListDTO">
+    <select id="singleRelationList" resultType="com.diagbot.dto.SingleRelationListDTO">
     	SELECT
-			*
-		FROM
-		(SELECT
-		t2.id AS conceptId,
-		t2.lib_name AS libName,
-		t4.name AS libType,
-		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no ASC,t1.gmt_modified DESC) AS otherNames,
-		t1.modifier AS operName,
-		MAX(t1.gmt_modified) AS operTime,
-		t1.is_deleted AS isDeleted
-		FROM
-		(SELECT
-		a.*
-		FROM
-		(SELECT * FROM kl_relation WHERE relation_id=17) a
-		JOIN kl_relation_order b ON a.id=b.t_relation_id
-		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) c
-		ON a.start_id=c.end_id
-		WHERE c.id IS NULL) t1
-		JOIN kl_concept t2 ON t1.start_id=t2.id
-		JOIN kl_concept t3 ON t1.end_id=t3.id
-		JOIN kl_lexicon t4 ON t2.lib_type=t4.id
-		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
-		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
-		GROUP BY t2.id) tab
-		where 1=1
-		<if test="name!=null and name!=''">
-			and libNameType like concat('%',#{name},'%')
-		</if>
-		ORDER BY isDeleted ASC,operTime DESC
-    </select> -->
-    
-    <select id="multContactList" resultType="com.diagbot.dto.MultContactListDTO">
-    	SELECT 
-		a.start_id AS conceptId,
+		d.id AS conceptId,
+		d.lib_name AS libName,
+		d.lib_type AS libTypeId,
+		CONCAT(d.lib_type,"101",e.lib_type) AS relationModelTypeCode,
+		GROUP_CONCAT(e.lib_name ORDER BY f.order_no ASC) AS otherNames,
 		a.modifier AS operName,
 		a.gmt_modified AS operTime,
-		a.is_deleted AS isDeleted,
-		GROUP_CONCAT(DISTINCT a.end_id ORDER BY d.order_no ASC) AS otherIds,
-		SUM(CASE WHEN b.start_id IS NULL THEN 0 ELSE 1 END) AS notnullcou
+		a.is_deleted AS isDeleted
 		FROM
-		(SELECT * FROM kl_relation WHERE relation_id=17
-		<choose>
-			<when test="rootNodeConceptIds==null"></when>
-			<when test="rootNodeConceptIds.size==0">
-				AND start_id=-99999999
-			</when>
-			<otherwise>
-				AND start_id IN
-				<foreach collection="rootNodeConceptIds" open="(" close=")" separator="," item="rootNodeConceptId">
-					#{rootNodeConceptId}
-				</foreach>
-			</otherwise>
-		</choose>
-		) a
-		LEFT JOIN (SELECT start_id FROM kl_relation WHERE relation_id=17) b ON a.end_id=b.start_id
-		LEFT JOIN (SELECT end_id FROM kl_relation WHERE relation_id=17) c ON a.start_id=c.end_id
-		LEFT JOIN kl_relation_order d ON a.id=d.t_relation_id
-		WHERE c.end_id IS NULL 
-		GROUP BY a.start_id
-		HAVING notnullcou>0
+		(SELECT id,is_deleted,gmt_modified,modifier,start_id,end_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') a
+		LEFT JOIN 
+		(SELECT end_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') b
+		ON a.start_id=b.end_id
+		LEFT JOIN 
+		(SELECT start_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') c
+		ON a.end_id=c.start_id
+		JOIN 
+		(SELECT id,lib_name,lib_type FROM kl_concept WHERE is_deleted='N' AND lib_type=#{startTypeId} 
+		<if test="name!=null and name!=''">
+			AND lib_name LIKE CONCAT("%",#{name},"%")
+		</if>
+		) d
+		ON a.start_id=d.id
+		JOIN
+		(SELECT id,lib_name,lib_type FROM kl_concept WHERE lib_type=#{endTypeId}) e
+		ON a.end_id=e.id
+		LEFT JOIN kl_relation_order f ON a.id=f.t_relation_id
+		WHERE b.end_id IS NULL AND c.start_id IS NULL
+		GROUP BY d.id
 		ORDER BY operTime DESC
     </select>
     
-    <select id="lisSonContactList" resultType="com.diagbot.dto.LisSonContactListDTO">
+    <select id="onlyByRootList" resultType="com.diagbot.dto.OnlyByRootListDTO">
     	SELECT
-			*
+		c.id AS conceptId,
+		c.lib_name AS libName,
+		c.lib_type AS libTypeId,
+		GROUP_CONCAT(d.lib_name ORDER BY e.order_no ASC) AS otherNames,
+		a.modifier AS operName,
+		a.gmt_modified AS operTime,
+		a.is_deleted AS isDeleted
 		FROM
-		(SELECT  
-		t2.id AS conceptId,
-		t2.lib_name AS libName,
-		t4.name AS libType,
-		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
-		t1.modifier AS operName,
-		MAX(t1.gmt_modified) AS operTime,
-		t1.is_deleted AS isDeleted
-		FROM kl_relation t1
-		JOIN kl_concept t2 ON t1.start_id=t2.id
-		JOIN kl_concept t3 ON t1.end_id=t3.id
-		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
-		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
-		WHERE t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
-		AND t1.relation_id=18
-		GROUP BY t2.id) tab
-		where 1=1
+		(SELECT id,is_deleted,gmt_modified,modifier,start_id,end_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') a
+		LEFT JOIN 
+		(SELECT end_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') b
+		ON a.start_id=b.end_id
+		JOIN 
+		(SELECT id,lib_name,lib_type FROM kl_concept WHERE is_deleted='N' 
+		AND lib_type in 
+		<foreach collection="startTypeIds" open="(" close=")" separator="," item="startTypeId">
+			#{startTypeId}
+		</foreach>
 		<if test="name!=null and name!=''">
-			and libName like concat('%',#{name},'%')
+			AND lib_name LIKE CONCAT("%",#{name},"%")
 		</if>
-		ORDER BY isDeleted ASC,operTime DESC
+		) c
+		ON a.start_id=c.id
+		JOIN kl_concept d ON a.end_id=d.id
+		LEFT JOIN kl_relation_order e ON a.id=e.t_relation_id
+		WHERE b.end_id IS NULL
+		GROUP BY c.id
+		ORDER BY operTime DESC
     </select>
     
+    
 
 </mapper>

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

@@ -21,16 +21,20 @@
 	id as id,
 	gmt_create as gmtCreate,
 	modifier as modifierid,
+	product_type as productType,
 	name as name,
 	refresh_time as
 	refreshTime,
 	status as status,
 	remark as remark
-	FROM icss_version_info u
-	WHERE u.is_deleted = 'N' AND u.status = 1
+	FROM kl_version_info u
+	WHERE u.is_deleted = 'N'
 	<if test="versionWrapperNameVO.name != null">
 		AND u.name LIKE CONCAT('%', #{versionWrapperNameVO.name}, '%')
 	</if>
+	<if test="versionWrapperNameVO.productType != null and versionWrapperNameVO.productType != ''">
+		AND u.product_type = #{versionWrapperNameVO.productType}
+	</if>
 	ORDER BY gmt_create DESC
 </select>
 </mapper>

prec-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -7,10 +7,12 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.RetrievalVO;
+import com.diagbot.vo.VersionVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -70,4 +72,11 @@ public interface AiptServiceClient {
      */
     @PostMapping("/concept/getConceptMap")
     RespDTO<Map<Long, String>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO);
+
+
+    /**
+     * 获取版本信息
+     */
+    @PostMapping("/versionInfo/getVersionInfoAlls")
+    RespDTO<VersionWrapperDTO> getVersionInfoAlls(@RequestBody VersionVO versionVO);
 }

prec-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -7,11 +7,13 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 
 import com.diagbot.vo.RetrievalVO;
+import com.diagbot.vo.VersionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,4 +65,13 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getConceptMap");
         return null;
     }
+
+    /**
+     * 获取版本信息
+     */
+    @Override
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls(VersionVO versionVO){
+        log.error("【hystrix】调用{}异常", "getVersionInfoAlls");
+        return null;
+    }
 }

prec-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+   // private String creator;
+
+  
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+  //  private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

prec-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

prec-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -0,0 +1,34 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.VersionVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年11月21日 上午11:07:01
+ */
+@Component
+public class VersionInfoFacade {
+
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+    /**
+     * 查询版本信息
+     *
+     * @return
+     */
+    public VersionWrapperDTO getVersionInfoAll() {
+        VersionVO versionVO = new VersionVO();
+        versionVO.setProductType(ProductTypeEnum.PREC.getKey());
+        RespDTO<VersionWrapperDTO> res = aiptServiceClient.getVersionInfoAlls(versionVO);
+        RespDTOUtil.respNGDealCover(res, "获取不到版本信息！");
+        return res.data;
+    }
+}

prec-service/src/main/java/com/diagbot/vo/VersionVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 版本信息
+ * @author: gaodm
+ * @time: 2019/8/7 13:26
+ */
+@Getter
+@Setter
+public class VersionVO {
+    /**
+     * 产品类型（1：云平台内部；2：云平台外部；3：icss；4：智能分诊；5：数据服务模式；6：智能预问诊）
+     */
+    private Integer productType;
+}

prec-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.facade.VersionInfoFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 版本信息(关于) 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@RestController
+@RequestMapping("/versionInfo")
+@Api(value = "版本信息(关于)API[by:wangfeng]", tags = { "WF——版本信息(关于)API" })
+@SuppressWarnings("unchecked")
+public class VersionInfoController {
+
+    @Autowired
+    VersionInfoFacade versionInfoFacade;
+
+    @ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+    @PostMapping("/getVersionInfoAlls")
+    @SysLogger("getVersionInfoAlls")
+    public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
+        VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
+        return RespDTO.onSuc(data);
+    }
+
+}

precman-service/src/main/java/com/diagbot/dto/QuestionPageDTO.java

@@ -159,6 +159,8 @@ public class QuestionPageDTO implements Serializable {
 
     private String formulaCode; //公式编码
 
+    private String combinationName;
+
     /**
      * 备注
      */

precman-service/src/main/java/com/diagbot/vo/QuestionPageVO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -20,4 +21,8 @@ public class QuestionPageVO extends Page {
     private List<Integer> tagTypeList;
     private List<Integer> controlTypeList;
     private List<Integer> notTypeList;
+    @NotNull(message = "调用类型不能为空:(1.独立填写单 2.组合填写单)")
+    private Integer callType;//调用类型（1.独立填写单 2.组合填写单）
+    private String combinationName;//组合项名称
+    private String name;//界面名称
 }

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,7 @@ public class QuestionInfoController {
             notes = "")
     @PostMapping("/page")
     @SysLogger("page")
-    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody QuestionPageVO questionPageVO) {
+    public RespDTO<IPage<QuestionPageDTO>> list(@RequestBody @Valid QuestionPageVO questionPageVO) {
         IPage<QuestionPageDTO> data = questionFacade.getListFac(questionPageVO);
         return RespDTO.onSuc(data);
     }

precman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -102,33 +102,102 @@
 
 
     <select id="getList" resultType="com.diagbot.dto.QuestionPageDTO">
-        SELECT a.* FROM `prec_question_info` a
-        WHERE a.is_deleted = 'N'
-        <if test="type != null and type != ''">
-            AND a.type = #{type}
-        </if>
-        <if test="tagName != null and tagName != ''">
-            AND a.tag_name like concat ('%', #{tagName}, '%')
-        </if>
-        <if test="notTypeList != null and notTypeList.size() > 0 ">
-            and a.type not in
-            <foreach  collection="notTypeList" item="notType" open="("  separator=","  close=")">
-                #{notType}
-            </foreach>
-        </if>
-        <if test="tagTypeList != null and tagTypeList.size() > 0 ">
-            and a.tag_type in
-            <foreach  collection="tagTypeList" item="tagType" open="("  separator=","  close=")">
-                #{tagType}
-            </foreach>
-        </if>
-        <if test="controlTypeList != null and controlTypeList.size() > 0 ">
-            and a.control_type in
-            <foreach  collection="controlTypeList" item="controlType" open="("  separator=","  close=")">
-                #{controlType}
-            </foreach>
+        <if test="callType != null and callType == 1">
+            SELECT
+            t1.id,
+            t1.is_deleted,
+            t1.gmt_create,
+            t1.gmt_modified,
+            t1.creator,
+            t1.modifier,
+            t1.tag_name,
+            t1.`name`,
+            t1.description,
+            group_concat(t3.tag_name) as combinationName,
+            t1.`sex_type`,
+            t1.age_begin,
+            t1.age_end,
+            t1.tag_type,
+            t1.control_type,
+            t1.type,
+            t1.item_type,
+            t1.label_prefix,
+            t1.label_suffix,
+            t1.url,
+            t1.spec_flag,
+            t1.required,
+            t1.explains,
+            t1.remark
+            FROM
+            `prec_question_info` t1
+            LEFT JOIN prec_question_mapping t2 on t1.id = t2.son_question and t2.is_deleted = 'N'
+            LEFT JOIN `prec_question_info` t3 on t2.parent_question = t3.id and t3.is_deleted = 'N'
+            WHERE t1.is_deleted = 'N'
+            <if test="combinationName != null and combinationName != ''">
+                and t3.tag_name like concat ('%', #{combinationName}, '%')
+            </if>
+            <if test="type != null and type != ''">
+                AND t1.type = #{type}
+            </if>
+            <if test="name != null and name != ''">
+                AND t1.name like concat ('%', #{name}, '%')
+            </if>
+            <if test="tagName != null and tagName != ''">
+                AND t1.tag_name like concat ('%', #{tagName}, '%')
+            </if>
+            <if test="notTypeList != null and notTypeList.size() > 0 ">
+                and t1.type not in
+                <foreach  collection="notTypeList" item="notType" open="("  separator=","  close=")">
+                    #{notType}
+                </foreach>
+            </if>
+            <if test="tagTypeList != null and tagTypeList.size() > 0 ">
+                and t1.tag_type in
+                <foreach  collection="tagTypeList" item="tagType" open="("  separator=","  close=")">
+                    #{tagType}
+                </foreach>
+            </if>
+            <if test="controlTypeList != null and controlTypeList.size() > 0 ">
+                and t1.control_type in
+                <foreach  collection="controlTypeList" item="controlType" open="("  separator=","  close=")">
+                    #{controlType}
+                </foreach>
+            </if>
+            group by t1.id
+            ORDER BY t1.gmt_modified desc
+        </if>
+        <if test="callType != null and callType == 2">
+            SELECT a.* FROM `prec_question_info` a
+            WHERE a.is_deleted = 'N'
+            <if test="type != null and type != ''">
+                AND a.type = #{type}
+            </if>
+            <if test="tagName != null and tagName != ''">
+                AND a.tag_name like concat ('%', #{tagName}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND a.name like concat ('%', #{name}, '%')
+            </if>
+            <if test="notTypeList != null and notTypeList.size() > 0 ">
+                and a.type not in
+                <foreach  collection="notTypeList" item="notType" open="("  separator=","  close=")">
+                    #{notType}
+                </foreach>
+            </if>
+            <if test="tagTypeList != null and tagTypeList.size() > 0 ">
+                and a.tag_type in
+                <foreach  collection="tagTypeList" item="tagType" open="("  separator=","  close=")">
+                    #{tagType}
+                </foreach>
+            </if>
+            <if test="controlTypeList != null and controlTypeList.size() > 0 ">
+                and a.control_type in
+                <foreach  collection="controlTypeList" item="controlType" open="("  separator=","  close=")">
+                    #{controlType}
+                </foreach>
+            </if>
+            order by a.gmt_modified desc
         </if>
-        order by a.gmt_modified desc
 
     </select>