Jelajahi Sumber

导入诊断依据

gaodm 4 tahun lalu
induk
melakukan
09838e53bb

+ 28 - 18
src/main/java/com/diagbot/entity/KlConcept.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlConcept implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -75,6 +76,7 @@ public class KlConcept implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -82,20 +84,23 @@ public class KlConcept implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -103,6 +108,7 @@ public class KlConcept implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -110,6 +116,7 @@ public class KlConcept implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getLibId() {
         return libId;
     }
@@ -117,6 +124,7 @@ public class KlConcept implements Serializable {
     public void setLibId(Long libId) {
         this.libId = libId;
     }
+
     public String getLibName() {
         return libName;
     }
@@ -124,6 +132,7 @@ public class KlConcept implements Serializable {
     public void setLibName(String libName) {
         this.libName = libName;
     }
+
     public Integer getLibType() {
         return libType;
     }
@@ -131,6 +140,7 @@ public class KlConcept implements Serializable {
     public void setLibType(Integer libType) {
         this.libType = libType;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -142,16 +152,16 @@ public class KlConcept implements Serializable {
     @Override
     public String toString() {
         return "KlConcept{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", libId=" + libId +
-            ", libName=" + libName +
-            ", libType=" + libType +
-            ", status=" + status +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", libId=" + libId +
+                ", libName=" + libName +
+                ", libType=" + libType +
+                ", status=" + status +
+                "}";
     }
 }

+ 30 - 19
src/main/java/com/diagbot/entity/KlConceptCommon.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlConceptCommon implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -80,6 +81,7 @@ public class KlConceptCommon implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -87,20 +89,23 @@ public class KlConceptCommon implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -108,6 +113,7 @@ public class KlConceptCommon implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -115,6 +121,7 @@ public class KlConceptCommon implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -122,6 +129,7 @@ public class KlConceptCommon implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public Integer getSexType() {
         return sexType;
     }
@@ -129,6 +137,7 @@ public class KlConceptCommon implements Serializable {
     public void setSexType(Integer sexType) {
         this.sexType = sexType;
     }
+
     public Double getMinAge() {
         return minAge;
     }
@@ -136,6 +145,7 @@ public class KlConceptCommon implements Serializable {
     public void setMinAge(Double minAge) {
         this.minAge = minAge;
     }
+
     public Double getMaxAge() {
         return maxAge;
     }
@@ -143,6 +153,7 @@ public class KlConceptCommon implements Serializable {
     public void setMaxAge(Double maxAge) {
         this.maxAge = maxAge;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -154,17 +165,17 @@ public class KlConceptCommon implements Serializable {
     @Override
     public String toString() {
         return "KlConceptCommon{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", sexType=" + sexType +
-            ", minAge=" + minAge +
-            ", maxAge=" + maxAge +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", sexType=" + sexType +
+                ", minAge=" + minAge +
+                ", maxAge=" + maxAge +
+                ", remark=" + remark +
+                "}";
     }
 }

+ 32 - 20
src/main/java/com/diagbot/entity/KlConceptDetail.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlConceptDetail implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -85,6 +86,7 @@ public class KlConceptDetail implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -92,20 +94,23 @@ public class KlConceptDetail implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -113,6 +118,7 @@ public class KlConceptDetail implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -120,6 +126,7 @@ public class KlConceptDetail implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -127,6 +134,7 @@ public class KlConceptDetail implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public String getTitle() {
         return title;
     }
@@ -134,6 +142,7 @@ public class KlConceptDetail implements Serializable {
     public void setTitle(String title) {
         this.title = title;
     }
+
     public String getContent() {
         return content;
     }
@@ -141,6 +150,7 @@ public class KlConceptDetail implements Serializable {
     public void setContent(String content) {
         this.content = content;
     }
+
     public String getText() {
         return text;
     }
@@ -148,6 +158,7 @@ public class KlConceptDetail implements Serializable {
     public void setText(String text) {
         this.text = text;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -155,6 +166,7 @@ public class KlConceptDetail implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getContentType() {
         return contentType;
     }
@@ -166,18 +178,18 @@ public class KlConceptDetail implements Serializable {
     @Override
     public String toString() {
         return "KlConceptDetail{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", title=" + title +
-            ", content=" + content +
-            ", text=" + text +
-            ", orderNo=" + orderNo +
-            ", contentType=" + contentType +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", title=" + title +
+                ", content=" + content +
+                ", text=" + text +
+                ", orderNo=" + orderNo +
+                ", contentType=" + contentType +
+                "}";
     }
 }

+ 28 - 18
src/main/java/com/diagbot/entity/KlConceptStatic.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlConceptStatic implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -75,6 +76,7 @@ public class KlConceptStatic implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -82,20 +84,23 @@ public class KlConceptStatic implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -103,6 +108,7 @@ public class KlConceptStatic implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -110,6 +116,7 @@ public class KlConceptStatic implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -117,6 +124,7 @@ public class KlConceptStatic implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -124,6 +132,7 @@ public class KlConceptStatic implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public String getClinicalPathwayName() {
         return clinicalPathwayName;
     }
@@ -131,6 +140,7 @@ public class KlConceptStatic implements Serializable {
     public void setClinicalPathwayName(String clinicalPathwayName) {
         this.clinicalPathwayName = clinicalPathwayName;
     }
+
     public String getNoticeName() {
         return noticeName;
     }
@@ -142,16 +152,16 @@ public class KlConceptStatic implements Serializable {
     @Override
     public String toString() {
         return "KlConceptStatic{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", status=" + status +
-            ", clinicalPathwayName=" + clinicalPathwayName +
-            ", noticeName=" + noticeName +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", status=" + status +
+                ", clinicalPathwayName=" + clinicalPathwayName +
+                ", noticeName=" + noticeName +
+                "}";
     }
 }

+ 26 - 17
src/main/java/com/diagbot/entity/KlDisease.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlDisease implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -70,6 +71,7 @@ public class KlDisease implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -77,20 +79,23 @@ public class KlDisease implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -98,6 +103,7 @@ public class KlDisease implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -105,6 +111,7 @@ public class KlDisease implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -112,6 +119,7 @@ public class KlDisease implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public String getIcd10Code() {
         return icd10Code;
     }
@@ -119,6 +127,7 @@ public class KlDisease implements Serializable {
     public void setIcd10Code(String icd10Code) {
         this.icd10Code = icd10Code;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -130,15 +139,15 @@ public class KlDisease implements Serializable {
     @Override
     public String toString() {
         return "KlDisease{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", icd10Code=" + icd10Code +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", icd10Code=" + icd10Code +
+                ", remark=" + remark +
+                "}";
     }
 }

+ 7 - 7
src/main/java/com/diagbot/entity/KlLibraryInfo.java

@@ -2,8 +2,8 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +31,12 @@ public class KlLibraryInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -92,18 +92,18 @@ public class KlLibraryInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 28 - 18
src/main/java/com/diagbot/entity/KlRelation.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlRelation implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -75,6 +76,7 @@ public class KlRelation implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -82,20 +84,23 @@ public class KlRelation implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -103,6 +108,7 @@ public class KlRelation implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -110,6 +116,7 @@ public class KlRelation implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getStartId() {
         return startId;
     }
@@ -117,6 +124,7 @@ public class KlRelation implements Serializable {
     public void setStartId(Long startId) {
         this.startId = startId;
     }
+
     public Integer getRelationId() {
         return relationId;
     }
@@ -124,6 +132,7 @@ public class KlRelation implements Serializable {
     public void setRelationId(Integer relationId) {
         this.relationId = relationId;
     }
+
     public Long getEndId() {
         return endId;
     }
@@ -131,6 +140,7 @@ public class KlRelation implements Serializable {
     public void setEndId(Long endId) {
         this.endId = endId;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -142,16 +152,16 @@ public class KlRelation implements Serializable {
     @Override
     public String toString() {
         return "KlRelation{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", startId=" + startId +
-            ", relationId=" + relationId +
-            ", endId=" + endId +
-            ", status=" + status +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", startId=" + startId +
+                ", relationId=" + relationId +
+                ", endId=" + endId +
+                ", status=" + status +
+                "}";
     }
 }

+ 30 - 19
src/main/java/com/diagbot/entity/KlRule.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlRule implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -80,6 +81,7 @@ public class KlRule implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -87,20 +89,23 @@ public class KlRule implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -108,6 +113,7 @@ public class KlRule implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -115,6 +121,7 @@ public class KlRule implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -122,6 +129,7 @@ public class KlRule implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public String getDescription() {
         return description;
     }
@@ -129,6 +137,7 @@ public class KlRule implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
     public Integer getRuleType() {
         return ruleType;
     }
@@ -136,6 +145,7 @@ public class KlRule implements Serializable {
     public void setRuleType(Integer ruleType) {
         this.ruleType = ruleType;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -143,6 +153,7 @@ public class KlRule implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public String getMsg() {
         return msg;
     }
@@ -154,17 +165,17 @@ public class KlRule implements Serializable {
     @Override
     public String toString() {
         return "KlRule{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", description=" + description +
-            ", ruleType=" + ruleType +
-            ", status=" + status +
-            ", msg=" + msg +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", description=" + description +
+                ", ruleType=" + ruleType +
+                ", status=" + status +
+                ", msg=" + msg +
+                "}";
     }
 }

+ 46 - 27
src/main/java/com/diagbot/entity/KlRuleBase.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlRuleBase implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -120,6 +121,7 @@ public class KlRuleBase implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -127,20 +129,23 @@ public class KlRuleBase implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -148,6 +153,7 @@ public class KlRuleBase implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -155,6 +161,7 @@ public class KlRuleBase implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getConceptId() {
         return conceptId;
     }
@@ -162,6 +169,7 @@ public class KlRuleBase implements Serializable {
     public void setConceptId(Long conceptId) {
         this.conceptId = conceptId;
     }
+
     public String getDescription() {
         return description;
     }
@@ -169,6 +177,7 @@ public class KlRuleBase implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
     public Integer getType() {
         return type;
     }
@@ -176,6 +185,7 @@ public class KlRuleBase implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
     public String getMinOperator() {
         return minOperator;
     }
@@ -183,6 +193,7 @@ public class KlRuleBase implements Serializable {
     public void setMinOperator(String minOperator) {
         this.minOperator = minOperator;
     }
+
     public String getMinValue() {
         return minValue;
     }
@@ -190,6 +201,7 @@ public class KlRuleBase implements Serializable {
     public void setMinValue(String minValue) {
         this.minValue = minValue;
     }
+
     public String getMinUnit() {
         return minUnit;
     }
@@ -197,6 +209,7 @@ public class KlRuleBase implements Serializable {
     public void setMinUnit(String minUnit) {
         this.minUnit = minUnit;
     }
+
     public String getMaxOperator() {
         return maxOperator;
     }
@@ -204,6 +217,7 @@ public class KlRuleBase implements Serializable {
     public void setMaxOperator(String maxOperator) {
         this.maxOperator = maxOperator;
     }
+
     public String getMaxValue() {
         return maxValue;
     }
@@ -211,6 +225,7 @@ public class KlRuleBase implements Serializable {
     public void setMaxValue(String maxValue) {
         this.maxValue = maxValue;
     }
+
     public String getMaxUnit() {
         return maxUnit;
     }
@@ -218,6 +233,7 @@ public class KlRuleBase implements Serializable {
     public void setMaxUnit(String maxUnit) {
         this.maxUnit = maxUnit;
     }
+
     public String getEqOperator() {
         return eqOperator;
     }
@@ -225,6 +241,7 @@ public class KlRuleBase implements Serializable {
     public void setEqOperator(String eqOperator) {
         this.eqOperator = eqOperator;
     }
+
     public String getEqValue() {
         return eqValue;
     }
@@ -232,6 +249,7 @@ public class KlRuleBase implements Serializable {
     public void setEqValue(String eqValue) {
         this.eqValue = eqValue;
     }
+
     public String getEqUnit() {
         return eqUnit;
     }
@@ -239,6 +257,7 @@ public class KlRuleBase implements Serializable {
     public void setEqUnit(String eqUnit) {
         this.eqUnit = eqUnit;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -250,25 +269,25 @@ public class KlRuleBase implements Serializable {
     @Override
     public String toString() {
         return "KlRuleBase{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", conceptId=" + conceptId +
-            ", description=" + description +
-            ", type=" + type +
-            ", minOperator=" + minOperator +
-            ", minValue=" + minValue +
-            ", minUnit=" + minUnit +
-            ", maxOperator=" + maxOperator +
-            ", maxValue=" + maxValue +
-            ", maxUnit=" + maxUnit +
-            ", eqOperator=" + eqOperator +
-            ", eqValue=" + eqValue +
-            ", eqUnit=" + eqUnit +
-            ", status=" + status +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", description=" + description +
+                ", type=" + type +
+                ", minOperator=" + minOperator +
+                ", minValue=" + minValue +
+                ", minUnit=" + minUnit +
+                ", maxOperator=" + maxOperator +
+                ", maxValue=" + maxValue +
+                ", maxUnit=" + maxUnit +
+                ", eqOperator=" + eqOperator +
+                ", eqValue=" + eqValue +
+                ", eqUnit=" + eqUnit +
+                ", status=" + status +
+                "}";
     }
 }

+ 26 - 17
src/main/java/com/diagbot/entity/KlRuleCondition.java

@@ -2,8 +2,9 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -31,12 +32,12 @@ public class KlRuleCondition implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -70,6 +71,7 @@ public class KlRuleCondition implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -77,20 +79,23 @@ public class KlRuleCondition implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -98,6 +103,7 @@ public class KlRuleCondition implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -105,6 +111,7 @@ public class KlRuleCondition implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getRuleId() {
         return ruleId;
     }
@@ -112,6 +119,7 @@ public class KlRuleCondition implements Serializable {
     public void setRuleId(Long ruleId) {
         this.ruleId = ruleId;
     }
+
     public Integer getGroupType() {
         return groupType;
     }
@@ -119,6 +127,7 @@ public class KlRuleCondition implements Serializable {
     public void setGroupType(Integer groupType) {
         this.groupType = groupType;
     }
+
     public Long getRuleBaseId() {
         return ruleBaseId;
     }
@@ -130,15 +139,15 @@ public class KlRuleCondition implements Serializable {
     @Override
     public String toString() {
         return "KlRuleCondition{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", ruleId=" + ruleId +
-            ", groupType=" + groupType +
-            ", ruleBaseId=" + ruleBaseId +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", ruleId=" + ruleId +
+                ", groupType=" + groupType +
+                ", ruleBaseId=" + ruleBaseId +
+                "}";
     }
 }

+ 66 - 0
src/main/java/com/diagbot/facade/ExportFacade.java

@@ -18,11 +18,17 @@ import com.diagbot.service.KlLibraryInfoService;
 import com.diagbot.service.KlRelationService;
 import com.diagbot.util.Cn2SpellUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.ImportDataVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -38,14 +44,19 @@ public class ExportFacade {
     @Autowired
     private ExportRelationRepository exportRelationRepository;
     @Autowired
+    @Qualifier("klConceptServiceImpl")
     private KlConceptService klConceptService;
     @Autowired
+    @Qualifier("klLibraryInfoServiceImpl")
     private KlLibraryInfoService klLibraryInfoService;
     @Autowired
+    @Qualifier("klConceptCommonServiceImpl")
     private KlConceptCommonService klConceptCommonService;
     @Autowired
+    @Qualifier("klDiseaseServiceImpl")
     private KlDiseaseService klDiseaseService;
     @Autowired
+    @Qualifier("klRelationServiceImpl")
     private KlRelationService klRelationService;
 
     public Boolean gdbExportNode() {
@@ -252,4 +263,59 @@ public class ExportFacade {
         }
         klRelationService.saveBatch(klRelations);
     }
+
+    public Map<String, Object> importExcel(MultipartFile file) {
+        List<ImportDataVO> data = ExcelUtils.importExcel(file, 0, 1, ImportDataVO.class);
+        List<KlConcept> klConcepts
+                = klConceptService.list(new QueryWrapper<KlConcept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+        );
+        Map<String, KlConcept> map
+                = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");
+        List<KlRelation> klRelations = new ArrayList<>();
+        List<String> relations = new ArrayList<>();
+        for (ImportDataVO importDataVO : data) {
+            //主症状
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getSymptomMainPush(), 100, 103, 501, map, klRelations, relations);
+            //次症状
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getSymptomSecPush(), 100, 103, 502, map, klRelations, relations);
+            //体格检查结果
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getVitalPush(), 100, 105, 503, map, klRelations, relations);
+            //实验室检查套餐
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getLisPush(), 100, 107, 504, map, klRelations, relations);
+            //辅助检查项目
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getPacsPush(), 100, 109, 505, map, klRelations, relations);
+            //辅助检查子项目
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getPacsPush(), 100, 110, 505, map, klRelations, relations);
+            //药品通用名
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getDrugPush(), 100, 101, 506, map, klRelations, relations);
+            //手术和操作
+            setKlRelations(importDataVO.getDiseasePush(), importDataVO.getOperationPush(), 100, 106, 507, map, klRelations, relations);
+        }
+        klRelationService.saveBatch(klRelations);
+        return null;
+    }
+
+    private void setKlRelations(String startStr, String endStr, Integer stype, Integer etype, Integer rtype,
+                                Map<String, KlConcept> map, List<KlRelation> klRelations, List<String> relations) {
+        if (StringUtil.isNotBlank(startStr)
+                && StringUtil.isNotBlank(endStr)) {
+            List<String> ends = Arrays.asList(endStr.replaceAll(";", ";").split(";"));
+            for (String s : ends) {
+                if (null != map.get(startStr + "_" + stype)
+                        && null != map.get(s + "_" + etype)) {
+                    KlRelation klRelation = new KlRelation();
+                    klRelation.setStartId(map.get(startStr.trim() + "_" + stype).getId());
+                    klRelation.setEndId(map.get(s.trim() + "_" + etype).getId());
+                    klRelation.setRelationId(rtype);
+                    String r = map.get(startStr.trim() + "_" + stype).getId() + "_" + rtype + "_" + map.get(s.trim() + "_" + etype).getId();
+                    if (!relations.contains(r)) {
+                        relations.add(r);
+                        klRelations.add(klRelation);
+                    }
+
+                }
+            }
+        }
+    }
 }

+ 13 - 0
src/main/java/com/diagbot/facade/KlConceptCommonFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlConceptCommonServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 13:06
+ */
+@Component
+public class KlConceptCommonFacade extends KlConceptCommonServiceImpl {
+}

+ 13 - 0
src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlConceptServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 13:05
+ */
+@Component
+public class KlConceptFacade extends KlConceptServiceImpl {
+}

+ 13 - 0
src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlDiseaseServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 13:07
+ */
+@Component
+public class KlDiseaseFacade extends KlDiseaseServiceImpl {
+}

+ 13 - 0
src/main/java/com/diagbot/facade/KlLibraryInfoFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlLibraryInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 13:06
+ */
+@Component
+public class KlLibraryInfoFacade extends KlLibraryInfoServiceImpl {
+}

+ 13 - 0
src/main/java/com/diagbot/facade/KlRelationFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlRelationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 13:07
+ */
+@Component
+public class KlRelationFacade extends KlRelationServiceImpl {
+}

+ 11 - 0
src/main/java/com/diagbot/web/ExportController.java

@@ -7,7 +7,11 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
 
 /**
  * @Description:
@@ -35,4 +39,11 @@ public class ExportController {
     public RespDTO<Boolean> gdbExportRelation() {
         return RespDTO.onSuc(exportFacade.gdbExportRelation());
     }
+
+    @ApiOperation(value = "诊断依据导入[gaodm]",
+            notes = "")
+    @PostMapping("/diagnoseImport")
+    public RespDTO<Map<String, Object>> diagnoseImport(@RequestParam("file") MultipartFile file) {
+        return RespDTO.onSuc(exportFacade.importExcel(file));
+    }
 }