Merge branch 'dev/KLBstand' into dev/precSR

# Conflicts:
#	prec-service/src/main/java/com/diagbot/client/TranServiceClient.java
#	prec-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

aipt-service/src/main/java/com/diagbot/util/ParamConvertUtil.java

@@ -36,7 +36,7 @@ public class ParamConvertUtil {
                 libType = LexiconTypeEnum.LIS_TABLES.getKey();
                 break;
             case Pacs:
-                libType = LexiconTypeEnum.PACS_PACKAGE.getKey();
+                libType = LexiconTypeEnum.PACS_ITEMS.getKey();
                 break;
             case Disease:
                 libType = LexiconTypeEnum.DIAGNOSIS.getKey();
@@ -94,7 +94,7 @@ public class ParamConvertUtil {
             case LIS_TABLES:
                 type = ConceptTypeEnum.LIS_TABLES.getKey();
                 break;
-            case PACS_PACKAGE:
+            case PACS_ITEMS:
                 type = ConceptTypeEnum.Pacs.getKey();
                 break;
             case DIAGNOSIS:

aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -214,7 +214,7 @@
         AND <![CDATA[ t3.min_age <= #{age} ]]>
         AND <![CDATA[ t3.max_age >= #{age} ]]>
         </if>
-        AND (t2.spell =  #{InputStr} OR t2.name =  #{InputStr})
+        AND (t2.spell =  UPPER(#{InputStr}) OR t2.name =  #{InputStr})
         <if test="inputIds != null and inputIds.size > 0">
             and t1.id not in
             <foreach item="id" collection="inputIds" open="(" separator="," close=")">
@@ -249,7 +249,7 @@
             AND <![CDATA[ t3.min_age <= #{age} ]]>
             AND <![CDATA[ t3.max_age >= #{age} ]]>
         </if>
-        AND (t2.spell LIKE CONCAT( #{InputStr},'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
+        AND (t2.spell LIKE CONCAT(UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
         <if test="inputIds != null and inputIds.size > 0">
             and t1.id not in
             <foreach item="id" collection="inputIds" open="(" separator="," close=")">
@@ -284,7 +284,7 @@
             AND <![CDATA[ t3.min_age <= #{age} ]]>
             AND <![CDATA[ t3.max_age >= #{age} ]]>
         </if>
-        AND (t2.spell LIKE CONCAT('%',#{InputStr},'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
+        AND (t2.spell LIKE CONCAT('%',UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
         <if test="inputIds != null and inputIds.size > 0">
             and t1.id not in
             <foreach item="id" collection="inputIds" open="(" separator="," close=")">
@@ -321,7 +321,7 @@
                 #{id}
             </foreach>
         </if>
-        AND (t2.spell =  #{InputStr} OR t2.name =  #{InputStr})
+        AND (t2.spell =  UPPER(#{InputStr}) OR t2.name =  #{InputStr})
         UNION
         SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
@@ -351,7 +351,7 @@
                 #{id}
             </foreach>
         </if>
-        AND (t2.spell LIKE CONCAT( #{InputStr},'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
+        AND (t2.spell LIKE CONCAT( UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
         UNION
         SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
@@ -381,7 +381,7 @@
                 #{id}
             </foreach>
         </if>
-        AND (t2.spell LIKE CONCAT('%',#{InputStr},'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
+        AND (t2.spell LIKE CONCAT('%',UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
         ) a1
         GROUP BY a1.selfId,a1.showType
     </select>

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -0,0 +1,31 @@
+package com.diagbot.client;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+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;
+
+/**
+ * @Description: 调用信息对接层服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
+public interface TranServiceClient {
+
+	/**
+	 * 
+	 * @param hospitalSetVO
+	 * @return
+	 */
+    @PostMapping("/sysSet/getSysSetInfoDatas")
+    RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
+}

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

@@ -0,0 +1,30 @@
+package com.diagbot.client.hystrix;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+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 lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 调用信息对接层服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@Component
+@Slf4j
+public class TranServiceHystrix implements TranServiceClient {
+
+	@Override
+	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
+		log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
+		return null;
+	}
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年6月12日 下午3:31:22
+ */
+@Setter
+@Getter
+public class SysSetInfoDTO {
+
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
+
+    /**
+     * 配置名称
+     */
+    private String name;
+    
+    /**
+     * 配置编码
+     */
+    private String code;
+    /**
+     * 配置值
+     */
+    private Integer value;
+}

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

@@ -0,0 +1,37 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.HospitalSetVO;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年6月18日 上午10:16:47
+ */
+@Component
+public class SysSetFacade {
+
+	@Autowired
+	TranServiceClient tranServiceClient;
+
+	/**
+	 * 根据医院code获取配置信息
+	 * 
+	 * @return
+	 */
+	public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
+		RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+		RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
+		return sysSetInfoLists.data;
+	}
+
+}

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

@@ -0,0 +1,38 @@
+package com.diagbot.vo;
+
+import com.diagbot.enums.SysTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年6月12日 下午3:30:26
+ */
+@Setter
+@Getter
+public class HospitalSetVO {
+
+	private String hospitalCode;
+
+	/**
+	 * 访问的系统类型
+	 * (1, "user-service"),(2, "diagbotman-service"),(3, "uaa-service"),(4, "log-service"),
+	 * (5, "bi-service"),(6, "ltapi-service"),(7, "feedback-service"),(8, "icss-old-service"),
+	 * (9, "triage-service"),(10, "appkey"),(11, "icss-service"),(12, "icssman-service"),(13, "knowledgeman-service"),
+	 * (14, "tran-service"),(15, "aipt-service"),(16, "data-service"),(17, "prec-service");
+	 */
+	@ApiModelProperty(hidden = true)
+	private Integer sysType = SysTypeEnum.DATA_SERVICE.getKey();
+
+	/**
+	 * 配置名称
+	 */
+	private String name;
+	/**
+	 * 配置编码
+	 */
+	private String code;
+}

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

@@ -0,0 +1,46 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.facade.SysSetFacade;
+import com.diagbot.vo.HospitalSetVO;
+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;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 医院所有配置信息 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-06-18
+ */
+@RestController
+@RequestMapping("/sysSet")
+@Api(value = "配置信息API", tags = { "配置信息API" })
+@SuppressWarnings("unchecked")
+public class SysSetController {
+
+	@Autowired
+	SysSetFacade sysSetFacade;
+	
+	@ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
+	@PostMapping("/getSysSetInfoDatas")
+	@SysLogger("getSysSetInfoDatas")
+	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
+
+		 List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+
+		return RespDTO.onSuc(data);
+	}
+}

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

@@ -110,8 +110,11 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
 
         Map<String, String> detailMap = new LinkedHashMap<>();
-        for (String detail : details) {
-            detailMap.put(detail, lisWithItemNamMap.get(project).get(detail));
+        Map<String, String> projectDetailMap = lisWithItemNamMap.get(project);
+        if (projectDetailMap != null) {
+            for (String detail : details) {
+                detailMap.put(detail, projectDetailMap.get(detail));
+            }
         }
         retMap.put("details", detailMap);
         return retMap;
@@ -142,8 +145,11 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
 
         Map<String, String> detailMap = new LinkedHashMap<>();
-        for (String detail : details) {
-            detailMap.put(detail, lisWithItemNamMap.get(project).get(detail));
+        Map<String, String> projectDetailMap = lisWithItemNamMap.get(project);
+        if (projectDetailMap != null) {
+            for (String detail : details) {
+                detailMap.put(detail, projectDetailMap.get(detail));
+            }
         }
         retMap.put("details", detailMap);
         return retMap;

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

@@ -116,8 +116,9 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                         QuestionDTO questionDTO = questionFacade.getById(questionVO);
                         BeanUtil.copyProperties(questionDTO, detailDTO);
                     }
-                    if (null != detailDTO.getRelationModule()) {
-                        detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
+                    if (null != detailDTO.getRelationModule() &&
+                            moduleInfoMap.get(detailDTO.getRelationModule()) != null) {
+                            detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
                     }
                 }
                 bean.setModuleDetailDTOList(moduleDetailDTOList);

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

@@ -320,14 +320,18 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 }
                 if(moduleInfoListDTO.getModuleType().intValue() == 1){//根据科室
                     if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                        if(null != deptInfoMap.get(moduleInfoListDTO.getRelationId())){
+                            moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                        }
                     }else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
                 }
                 if(moduleInfoListDTO.getModuleType().intValue() == 2){//根据疾病
-                    if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        moduleInfoListDTO.setRelationName(disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                    if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是疾病通用子模板
+                        if(null != disInfoMap.get(moduleInfoListDTO.getRelationId())){
+                            moduleInfoListDTO.setRelationName(disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                        }
                     }else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }

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

@@ -29,6 +29,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/getKlmEnumsData").permitAll()
                 .antMatchers("/concept/getConceptMap").permitAll()
                 .antMatchers("/concept/getConceptListByType").permitAll()
+                .antMatchers("/concept/piyinUp").permitAll()
                 .antMatchers("/file/uploadImage").permitAll()
                 .antMatchers("/dictionaryInfo/getList").permitAll()
                 .antMatchers("/commonconcept/getConceptMapByNameAndType").permitAll()

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

@@ -92,6 +92,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/getKlmEnumsData", request)
                 || matchers("/concept/getConceptMap", request)
                 || matchers("/concept/getConceptListByType", request)
+                || matchers("/concept/piyinUp", request)
                 || matchers("/file/uploadImage", request)
                 || matchers("/dictionaryInfo/getList", request)
                 || matchers("/commonconcept/getConceptMapByNameAndType", request)

knowledgeman-service/src/main/java/com/diagbot/entity/ConceptCommon.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-05-09
+ * @since 2019-06-17
  */
 @TableName("kl_concept_common")
 public class ConceptCommon implements Serializable {
@@ -81,6 +81,11 @@ public class ConceptCommon implements Serializable {
      */
     private String code;
 
+    /**
+     * 0-不推送；1-推送
+     */
+    private String isPush;
+
     /**
      * 备注
      */
@@ -170,6 +175,13 @@ public class ConceptCommon implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+    public String getIsPush() {
+        return isPush;
+    }
+
+    public void setIsPush(String isPush) {
+        this.isPush = isPush;
+    }
     public String getRemark() {
         return remark;
     }
@@ -193,6 +205,7 @@ public class ConceptCommon implements Serializable {
         ", maxAge=" + maxAge +
         ", deptId=" + deptId +
         ", code=" + code +
+        ", isPush=" + isPush +
         ", remark=" + remark +
         "}";
     }

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

@@ -831,7 +831,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                 res = getConceptByType(LexiconTypeEnum.DEPARTMENT.getKey());
                 break;
             case 2:
-                res = getConceptByType(LexiconTypeEnum.PACS_PACKAGE.getKey());
+                res = getConceptByType(LexiconTypeEnum.PACS_ITEMS.getKey());
                 break;
             case 3:
                 res = getConceptChronic();

knowledgeman-service/src/main/java/com/diagbot/util/ParamConvertUtil.java

@@ -36,7 +36,7 @@ public class ParamConvertUtil {
                 libType = LexiconTypeEnum.LIS_TABLES.getKey();
                 break;
             case Pacs:
-                libType = LexiconTypeEnum.PACS_PACKAGE.getKey();
+                libType = LexiconTypeEnum.PACS_ITEMS.getKey();
                 break;
             case Disease:
                 libType = LexiconTypeEnum.DIAGNOSIS.getKey();
@@ -94,7 +94,7 @@ public class ParamConvertUtil {
             case LIS_TABLES:
                 type = ConceptTypeEnum.LIS_TABLES.getKey();
                 break;
-            case PACS_PACKAGE:
+            case PACS_ITEMS:
                 type = ConceptTypeEnum.Pacs.getKey();
                 break;
             case DIAGNOSIS:

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

@@ -68,6 +68,12 @@ public class AddConceptInfoVO {
 	@Range(min=0,max=200,message="年龄须是0-200")
     private Integer maxAge=200;
 	
+    /**
+     * 是否推送：0-不推送；1-推送
+     */
+	@ApiModelProperty(value="是否推送：0-不推送；1-推送")
+    private String isPush="0";
+	
 	private Integer lineNum;
 	
 	

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

@@ -16,6 +16,7 @@
         <result column="max_age" property="maxAge" />
         <result column="dept_id" property="deptId" />
         <result column="code" property="code" />
+        <result column="is_push" property="isPush" />
         <result column="remark" property="remark" />
     </resultMap>
 

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

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("diagbot@20180822");
-        dsc.setUrl("jdbc:mysql://192.168.2.235:3306/med-dev?useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.235:3306/med-man?useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_relation"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_concept_common"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

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

@@ -1,10 +1,5 @@
 package com.diagbot.client;
 
-import com.diagbot.client.hystrix.TranServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.vo.HospitalSetVO;
-
 import java.util.List;
 
 import javax.validation.Valid;
@@ -13,6 +8,11 @@ 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;
+
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm

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

@@ -1,5 +1,11 @@
 package com.diagbot.client.hystrix;
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
@@ -7,12 +13,15 @@ import com.diagbot.vo.HospitalSetVO;
 
 import lombok.extern.slf4j.Slf4j;
 
+<<<<<<< HEAD
 import java.util.List;
 
 import javax.validation.Valid;
 
 import org.springframework.stereotype.Component;
 
+=======
+>>>>>>> dev/KLBstand
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm