Merge branch 'develop' into dev/prec20191219_quote

# Conflicts:
#	tran-service/src/main/java/com/diagbot/facade/PatientInfoDjFacade.java

aipt-service/src/main/java/com/diagbot/entity/HospitalDept.java

@@ -3,6 +3,8 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,6 +18,8 @@ import java.util.Date;
  * @since 2018-11-19
  */
 @TableName("tran_hospital_dept")
+@Getter
+@Setter
 public class HospitalDept implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -86,116 +90,13 @@ public class HospitalDept implements Serializable {
      */
     private String remark;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getHospitalCode() {
-        return hospitalCode;
-    }
-
-    public void setHospitalCode(String hospitalCode) {
-        this.hospitalCode = hospitalCode;
-    }
-    public String getHospitalName() {
-        return hospitalName;
-    }
-
-    public void setHospitalName(String hospitalName) {
-        this.hospitalName = hospitalName;
-    }
-
-    public String getConceptDeptName() {
-        return conceptDeptName;
-    }
-
-    public void setconceptDeptName(String conceptDeptName) {
-        this.conceptDeptName = conceptDeptName;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "HospitalDept{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", code=" + code +
-                ", name=" + name +
-                ", hospitalCode=" + hospitalCode +
-                ", hospitalName=" + hospitalName +
-                ", conceptDeptName=" + conceptDeptName +
-                ", status=" + status +
-                ", remark=" + remark +
-                "}";
-    }
+    /**
+     * 医院科室地址
+     */
+    private String url;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
 }

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

@@ -104,7 +104,7 @@ public class TransferFacade {
         }
         for (Lis lisResult : lis) {
             //内部数据，获取标签时映射， 不二次映射
-            if (lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
+            if (lisResult.getSource() == null || lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
                 retLis.add(lisResult);
                 continue;
             }

docs/027.20191228智能分诊显示方案/init_tran.sql

@@ -0,0 +1,10 @@
+use `sys-tran`;
+
+ALTER TABLE `tran_hospital_dept`
+ADD COLUMN `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号' AFTER `status`;
+
+ALTER TABLE `tran_hospital_dept`
+ADD COLUMN `url` varchar(255) NOT NULL DEFAULT '' COMMENT '医院科室地址' AFTER `order_no`;
+
+
+INSERT INTO `sys-tran`.`tran_sys_set` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_code`, `plan`, `sys_type`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', NULL, NULL, 'A001', '0', '9', '科室显示模式', 'dept_mode', '2', '1显示标准科室，2显示医院科室');

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

@@ -3,6 +3,8 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,6 +18,8 @@ import java.util.Date;
  * @since 2018-11-19
  */
 @TableName("tran_hospital_dept")
+@Getter
+@Setter
 public class HospitalDept implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -86,116 +90,13 @@ public class HospitalDept implements Serializable {
      */
     private String remark;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getHospitalCode() {
-        return hospitalCode;
-    }
-
-    public void setHospitalCode(String hospitalCode) {
-        this.hospitalCode = hospitalCode;
-    }
-    public String getHospitalName() {
-        return hospitalName;
-    }
-
-    public void setHospitalName(String hospitalName) {
-        this.hospitalName = hospitalName;
-    }
-
-    public String getConceptDeptName() {
-        return conceptDeptName;
-    }
-
-    public void setconceptDeptName(String conceptDeptName) {
-        this.conceptDeptName = conceptDeptName;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "HospitalDept{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", code=" + code +
-                ", name=" + name +
-                ", hospitalCode=" + hospitalCode +
-                ", hospitalName=" + hospitalName +
-                ", conceptDeptName=" + conceptDeptName +
-                ", status=" + status +
-                ", remark=" + remark +
-                "}";
-    }
+    /**
+     * 医院科室地址
+     */
+    private String url;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
 }

tran-service/src/main/java/com/diagbot/dto/HospitalDeptDTO.java

@@ -30,4 +30,9 @@ public class HospitalDeptDTO {
      * 医院名称
      */
     private String hospitalName;
+
+    /**
+     * 医院科室地址
+     */
+    private String url;
 }

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

@@ -76,7 +76,8 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
         hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_code", hospitalDeptVO.getHospitalCode())
                 .eq("status", StatusEnum.Enable.getKey())
-                .in("concept_dept_name", hospitalDeptVO.getConceptNames());
+                .in("concept_dept_name", hospitalDeptVO.getConceptNames())
+                .orderByAsc("concept_dept_name", "order_no");
         List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);
         if (ListUtil.isNotEmpty(hospitalDeptList)) {
             Map<String, List<HospitalDept>> hospitalDeptMap
@@ -89,6 +90,7 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
                     hospitalDeptDTO.setHospitalName(hospitalDept.getHospitalName());
                     hospitalDeptDTO.setHospitalDeptCode(hospitalDept.getCode());
                     hospitalDeptDTO.setHospitalDeptName(hospitalDept.getName());
+                    hospitalDeptDTO.setUrl(hospitalDept.getUrl());
                     hospitalDeptDTOList.add(hospitalDeptDTO);
                 }
                 retMap.put(entry.getKey(), hospitalDeptDTOList);
@@ -98,7 +100,6 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
     }
 
     /**
-     *
      * @param hospitalCodeVo
      * @return
      */
@@ -108,7 +109,7 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
                 .eq("hospital_code", hospitalCodeVo.getHospitalCode())
                 .eq("status", StatusEnum.Enable.getKey())
                 .like(StringUtil.isNotBlank(hospitalCodeVo.getThirdpartyName()),
-                        "name",hospitalCodeVo.getThirdpartyName())
+                        "name", hospitalCodeVo.getThirdpartyName())
                 .like(StringUtil.isNotBlank(hospitalCodeVo.getDeptInfoName()),
                         "concept_dept_name", hospitalCodeVo.getDeptInfoName());
         List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);

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

@@ -16,6 +16,8 @@
         <result column="hospital_name" property="hospitalName" />
         <result column="concept_dept_name" property="conceptDeptName" />
         <result column="status" property="status" />
+        <result column="order_no" property="orderNo" />
+        <result column="url" property="url" />
         <result column="remark" property="remark" />
     </resultMap>
 

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

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

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

@@ -3,11 +3,14 @@ package com.diagbot.client;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.HospitalDeptDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.HospitalDeptVO;
+import com.diagbot.vo.HospitalSetVO;
 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;
 
@@ -20,4 +23,7 @@ import java.util.Map;
 public interface TranServiceClient {
     @PostMapping(value = "/hospitalDeptInfo/hospitalDeptByConceptNames")
     RespDTO<Map<String, List<HospitalDeptDTO>>> hospitalDeptByConceptNames(@RequestBody HospitalDeptVO hospitalDeptVO);
+
+    @PostMapping("/sysSet/getSysSetInfoDatas")
+    RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
 }

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

@@ -3,11 +3,14 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.HospitalDeptDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.HospitalDeptVO;
+import com.diagbot.vo.HospitalSetVO;
 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;
 
@@ -24,4 +27,10 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "hospitalDeptByConceptNames");
         return null;
     }
+
+    @Override
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
+        log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
+        return null;
+    }
 }

triage-service/src/main/java/com/diagbot/dto/HospitalDeptDTO.java

@@ -30,4 +30,9 @@ public class HospitalDeptDTO {
      * 医院名称
      */
     private String hospitalName;
+
+    /**
+     * 医院科室地址
+     */
+    private String url;
 }

triage-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 String value;
+}

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

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @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;
+    }
+
+}

triage-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.TRIAGE_SERVICE.getKey();
+
+	/**
+	 * 配置名称
+	 */
+	private String name;
+	/**
+	 * 配置编码
+	 */
+	private String code;
+}

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

@@ -0,0 +1,44 @@
+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);
+    }
+}