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

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

@@ -7,15 +7,18 @@ import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -142,4 +145,7 @@ public interface TranServiceClient {
      */
     @PostMapping(value = "/indexData/saveIndexDatas")
     RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
+
+    @PostMapping("/sysSet/getSysSetInfoDatas")
+    RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
 }

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

@@ -1,27 +1,26 @@
 package com.diagbot.client.hystrix;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 调用信息对接层服务
@@ -156,4 +155,10 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "saveIndexDatas");
         return null;
     }
+
+    @Override
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
+        log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
+        return null;
+    }
 }

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

@@ -0,0 +1,72 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年6月12日 下午3:31:22
+ */
+@Setter
+@Getter
+public class SysSetInfoDTO {
+	  /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院编码
+     */
+    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;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -12,11 +12,13 @@ import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.LisResult;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.LisSourceEnum;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.EntityUtil;
@@ -26,9 +28,9 @@ import com.diagbot.util.ParamConvertUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptBaseVO;
+import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.SearchVo;
 import com.google.common.collect.Lists;
-import org.apache.ibatis.javassist.compiler.Lex;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -70,9 +72,26 @@ public class PushFacade {
         if (StringUtil.isNotBlank(searchVo.getHosCode())) {
             HosCodeVO hosCodeVO = new HosCodeVO();
             hosCodeVO.setHosCode(searchVo.getHosCode());
-            RespDTO<Boolean> connectRes = tranServiceClient.isConnect(hosCodeVO);
-            if (RespDTOUtil.respIsOK(connectRes)) {
-                isConnect = connectRes.data;
+            HospitalSetVO hospitalSetVO = new HospitalSetVO();
+            hospitalSetVO.setHospitalCode(searchVo.getHosCode());
+            hospitalSetVO.setCode("connect");
+            if (searchVo.getSysType() != null) {
+                hospitalSetVO.setSysType(searchVo.getSysType());
+            } else {
+                hospitalSetVO.setSysType(SysTypeEnum.AIPT_SERVICE.getKey());
+            }
+            RespDTO<List<SysSetInfoDTO>> sysSetInfoListRes = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+            if (RespDTOUtil.respIsOK(sysSetInfoListRes)) {
+                List<SysSetInfoDTO> sysSetInfoList = sysSetInfoListRes.data;
+                if (ListUtil.isNotEmpty(sysSetInfoList)) {
+                    if (sysSetInfoList.get(0).getValue().equals(1)) {
+                        isConnect = true;
+                    } else {
+                        isConnect = false;
+                    }
+                } else {
+                    isConnect = false;
+                }
             }
         }
 

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

@@ -0,0 +1,35 @@
+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:knowledge-service,7:feedback-service,8:icss-web
+	 */
+	@ApiModelProperty(hidden = true)
+	private Integer sysType = SysTypeEnum.ICSS_SERVICE.getKey();
+
+	/**
+	 * 配置名称
+	 */
+	private String name;
+	/**
+	 * 配置编码
+	 */
+	private String code;
+}

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

@@ -39,4 +39,5 @@ public class SearchVo {
     private String adverseReactions; //不良反应
     private Integer disType;    //诊断类型
     private String hosCode;  // 对接时，hosCode必填
+    private Integer sysType; //系统类型
 }

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -1,5 +1,6 @@
 package com.diagbot.client.bean;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -33,4 +34,6 @@ public class SearchData {
     private Integer disType;    //诊断类型
     private String adverseEvent;
     private String hosCode;
+    @ApiModelProperty(hidden = true)
+    private Integer sysType;  //系统类型
 }

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.diagbot.client.bean.LisResult;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.PushVO;
@@ -40,6 +41,7 @@ public class AssembleFacade {
         searchData.setFeatureType(pushVO.getFeatureType());
         searchData.setSysCode("1");
         searchData.setLength(10);
+        searchData.setSysType(SysTypeEnum.DATA_SERVICE.getKey());
         searchData.setHosCode(pushVO.getHosCode());
 
         switch (pushVO.getSex()) {

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

@@ -83,7 +83,7 @@ public interface TranServiceClient {
      * @return
      */
     @PostMapping("/hospitalInfo/getHospitalInfo")
-    RespDTO<List<HospitalInfoDTO>> getHospitalInfo(@RequestBody HospitalInfoVO hospitalInfoVO);
+    RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody HospitalInfoVO hospitalInfoVO);
 
     /**
      * 匹配公表名

icss-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -1,6 +1,7 @@
 package com.diagbot.client.bean;
 
 import com.diagbot.vo.LisResult;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -34,4 +35,6 @@ public class SearchData {
     private Integer disType;    //诊断类型
     private String adverseEvent;
     private String hosCode;    //医院编码
+    @ApiModelProperty(hidden = true)
+    private Integer sysType;   //系统类型
 }

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

@@ -63,7 +63,7 @@ public class TranServiceHystrix implements TranServiceClient {
     }
 
     @Override
-    public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+    public RespDTO<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         log.error("【hystrix】调用{}异常", "getHospitalInfo");
         return null;
     }

icss-service/src/main/java/com/diagbot/dto/HospitalInfoDTO.java

@@ -1,5 +1,7 @@
 package com.diagbot.dto;
 
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -37,19 +39,9 @@ public class HospitalInfoDTO {
     private String spell;
 
     /**
-     * 是否对接（0-不对接，1-对接）
-     */
-    private Integer connect;
-
-    /**
-     * 化验导入方式
-     */
-    private Integer importWayLis;
-    
-    /**
-     * 辅检导入方式
+     * 配置信息
      */
-    private Integer importWayPacs;
+    private List<SysSetInfoDTO>  SysSetInfoData;
 
     /**
      * 备注

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

@@ -17,30 +17,6 @@ import lombok.Setter;
 @Setter
 @Getter
 public class SysSetInfoDTO {
-	  /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
 
     /**
      * 医院编码
@@ -65,9 +41,4 @@ public class SysSetInfoDTO {
      * 配置值
      */
     private Integer value;
-
-    /**
-     * 备注
-     */
-    private String remark;
 }

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.enums.LisSourceEnum;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -47,6 +48,7 @@ public class AssembleFacade {
         searchData.setHosCode(pushVO.getHosCode());
         searchData.setSysCode("1");
         searchData.setLength(10);
+        searchData.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
 
         switch (pushVO.getSex()) {
             case 1:

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

@@ -1,16 +1,17 @@
 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.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
+import com.diagbot.vo.HospitalSetVO;
 
 /**
  * @Description:
@@ -29,10 +30,16 @@ public class HospitalInfoFacade {
      * @param hospitalInfoVO
      * @return
      */
-    public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
-        RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
+    public HospitalInfoDTO getHospitalInfo(HospitalSetVO hospitalSetVO) {
+    	HospitalInfoVO hospitalInfoVO =new HospitalInfoVO();
+    	hospitalInfoVO.setCode(hospitalSetVO.getHospitalCode());
+        RespDTO<HospitalInfoDTO> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
         RespDTOUtil.respNGDealCover(hospitalInfoDTOList, "获取医院信息失败");
-        return hospitalInfoDTOList.data;
+        HospitalInfoDTO data = hospitalInfoDTOList.data;
+        RespDTO<List<SysSetInfoDTO>> sysSetInfoLists = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+		RespDTOUtil.respNGDeal(sysSetInfoLists, "获取配置数据失败！");
+        data.setSysSetInfoData(sysSetInfoLists.data);
+        return data;
     }
 
     /**
@@ -44,13 +51,9 @@ public class HospitalInfoFacade {
     public HospitalInfoDTO getHospitalByCode(String code) {
         HospitalInfoVO hospitalInfoVO = new HospitalInfoVO();
         hospitalInfoVO.setCode(code);
-        RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
-        if (RespDTOUtil.respIsNG(hospitalInfoDTOList)
-                || hospitalInfoDTOList.data.size() != 1) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取医院信息失败");
-        }
-        return hospitalInfoDTOList.data.get(0);
+        RespDTO<HospitalInfoDTO> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
+        RespDTOUtil.respNGDeal(hospitalInfoDTOList, "获取医院信息失败");
+        return hospitalInfoDTOList.data;
     }
 
 }

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

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import com.diagbot.enums.SysTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,9 +19,13 @@ public class HospitalSetVO {
 
 	/**
 	 * 访问的系统类型
-	 * 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+	 * (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");
 	 */
-	private Integer sysType;
+	@ApiModelProperty(hidden = true)
+	private Integer sysType = SysTypeEnum.ICSS_SERVICE.getKey();
 
 	/**
 	 * 配置名称

icss-service/src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -1,21 +1,21 @@
 package com.diagbot.web;
 
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.HospitalInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.HospitalInfoFacade;
-import com.diagbot.vo.HospitalInfoVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.Valid;
+
 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 springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-import java.util.List;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.HospitalInfoFacade;
+import com.diagbot.vo.HospitalSetVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @Description:
@@ -32,12 +32,11 @@ public class HospitalInfoController {
     private HospitalInfoFacade hospitalInfoFacade;
 
     @ApiOperation(value = "ICSS三期-医院信息——根据医院编码获取医院信息[by:wangyu]",
-            notes = "id: 医院id<br>" +
-                    "code：医院编码<br>")
+            notes = "hospitalCode：医院编码<br> sysType :访问的系统类型  , 配置名称:name; 配置编码:code;<br> ")
     @PostMapping("/getHospitalInfo")
     @SysLogger("getHospitalInfo")
-    public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
-        List<HospitalInfoDTO> data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
+    public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalSetVO hospitalSetVO) {
+        HospitalInfoDTO data = hospitalInfoFacade.getHospitalInfo(hospitalSetVO);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -1,25 +1,21 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-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 com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.IndexDataDTO;
 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>

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -80,15 +80,6 @@ public class HospitalInfo implements Serializable {
      * 排序号
      */
     private Integer orderNo;
-    /**
-     * 化验导入方式
-     */
-    private Integer importWayLis;
-    
-    /**
-     * 辅检导入方式
-     */
-    private Integer importWayPacs;
 
     /**
      * 备注
@@ -196,22 +187,6 @@ public class HospitalInfo implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public Integer getImportWayLis() {
-		return importWayLis;
-	}
-
-	public void setImportWayLis(Integer importWayLis) {
-		this.importWayLis = importWayLis;
-	}
-
-	public Integer getImportWayPacs() {
-		return importWayPacs;
-	}
-
-	public void setImportWayPacs(Integer importWayPacs) {
-		this.importWayPacs = importWayPacs;
-	}
-
 	public String getRemark() {
         return remark;
     }

tran-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -1,11 +1,13 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
 import org.springframework.stereotype.Component;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.HospitalInfoVO;
 
 /**
@@ -16,15 +18,26 @@ import com.diagbot.vo.HospitalInfoVO;
 @Component
 public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 
-    /**
+    private static final Object HospitalInfoDTO = null;
+
+	/**
      * 获取医院信息
      *
      * @param hospitalInfoVO
      * @return
      */
-    public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+   /* public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
         return hospitalInfoDTOList;
     }
-
+*/
+	public HospitalInfoDTO getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+		QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        			.in("code", hospitalInfoVO.getCode());
+        HospitalInfo datas = this.getOne(queryWrapper);
+        HospitalInfoDTO data =new HospitalInfoDTO();
+        BeanUtil.copyProperties(datas, data);
+        return data;
+    }
 }

tran-service/src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -37,8 +37,8 @@ public class HospitalInfoController {
                     "code：医院编码<br>")
     @PostMapping("/getHospitalInfo")
     @SysLogger("getHospitalInfo")
-    public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
-        List<HospitalInfoDTO> data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
+    public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
+        HospitalInfoDTO data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
         return RespDTO.onSuc(data);
     }
 }

tran-service/src/main/resources/mapper/HospitalInfoMapper.xml

@@ -16,8 +16,6 @@
         <result column="spell" property="spell" />
         <result column="status" property="status" />
         <result column="order_no" property="orderNo" />
-        <result column="import_way_lis" property="importWayLis" />
-        <result column="import_way_pacs" property="importWayPacs" />
         <result column="connect" property="connect" />
         <result column="remark" property="remark" />
     </resultMap>