分诊科室对接

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;
 }

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

@@ -1,7 +1,7 @@
 use `sys-tran`;
 
 ALTER TABLE `tran_hospital_dept`
-ADD COLUMN `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号' AFTER `status`；
+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`;

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/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/facade/HospitalDeptFacade.java

@@ -90,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);

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

@@ -289,7 +289,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
                             hospitalDept.setHospitalName(StringUtil.isNotBlank(sonHospitalCode) ? sonHospitalName : hospitalName);
                             hospitalDept.setCode(i.getHospitalDeptCode());
                             hospitalDept.setName(i.getHospitalDeptName());
-                            hospitalDept.setconceptDeptName("全科");
+                            hospitalDept.setConceptDeptName("全科");
                             deptSaveOrUpdateList.add(hospitalDept);
                         } else {
                             hospitalDeptQuery.setName(i.getHospitalDeptName());
@@ -485,7 +485,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
                 hospitalDept.setGmtCreate(now);
                 hospitalDept.setHospitalCode(hospitalCode);
                 hospitalDept.setHospitalName(hospitalName);
-                hospitalDept.setconceptDeptName("全科");
+                hospitalDept.setConceptDeptName("全科");
             } else {
                 deptId = hospitalDept.getId().longValue();
             }

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

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