更新图谱实体及查询的方法

src/main/java/com/diagbot/dto/PacsBillDTO.java

@@ -0,0 +1,51 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @description: 辅检开单合理性项目
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+@Setter
+@Getter
+public class PacsBillDTO {
+    // 禁忌性别
+    private String gender;
+
+    // 年龄最小值
+    private int minage;
+
+    // 年龄最大值
+    private int maxage;
+
+    // 临床表现
+    private List<String> clinicfindings;
+
+    // 服用药品
+    private List<String> prescribe;
+
+    // 禁忌过敏药品
+    private List<String> allergmeds;
+
+    // 禁忌手术
+    private List<String> operations;
+
+    // 禁忌操作
+    private List<String> procedures;
+
+    // 禁忌辅助检查
+    private List<String> PACS;
+
+    // 禁忌疾病
+    private List<String> disease;
+
+    // 禁用人群
+    private List<String> group;
+
+}

src/main/java/com/diagbot/dto/PresBillDTO.java

@@ -0,0 +1,45 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @description: 药方开单合理性项目
+ * @author: Mark
+ * @time: 2020/7/29 9:57
+ */
+@Data
+public class PresBillDTO {
+    // 禁忌性别
+    private String gender;
+
+    // 年龄最小值
+    private int minage;
+
+    // 年龄最大值
+    private int maxage;
+
+    // 临床表现
+    private List<String> clinicfindings;
+
+    // 禁忌手术
+    private List<String> operations;
+
+    // 禁忌操作
+    private List<String> procedures;
+
+    // 禁忌辅助检查
+    private List<String> PACS;
+
+    // 禁忌疾病
+    private List<String> disease;
+
+    // 禁用人群
+    private List<String> group;
+
+    // 配伍禁忌
+    private List<String> meds;
+}

src/main/java/com/diagbot/entity/node/AgeMax.java

@@ -3,13 +3,16 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "年龄最大值")
 public class AgeMax extends BaseNode  {

src/main/java/com/diagbot/entity/node/AgeMin.java

@@ -4,13 +4,16 @@ import com.diagbot.model.ai.model.Relation;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "年龄最小值")
 public class AgeMin extends BaseNode {

src/main/java/com/diagbot/entity/node/AllergicMed.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "过敏药品")
 public class AllergicMed extends BaseNode  {

src/main/java/com/diagbot/entity/node/ClinicalFinding.java

@@ -3,17 +3,22 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
-//@EqualsAndHashCode(callSuper = false)
+@Setter
+@Getter
+//@EqualsAndHashCode(callSuper = true)
 @NodeEntity(label = "临床表现")
 public class ClinicalFinding extends BaseNode  {
 
     @Relationship(type="药品通用名禁忌临床表现", direction = Relationship.INCOMING)
     private Set<Medicine> medicines;
+
+
 }

src/main/java/com/diagbot/entity/node/ConflictMed.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "配伍")
 public class ConflictMed extends BaseNode  {

src/main/java/com/diagbot/entity/node/Disease.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "疾病")
 public class Disease extends BaseNode  {

src/main/java/com/diagbot/entity/node/Gender.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "性别")
 public class Gender extends BaseNode  {

src/main/java/com/diagbot/entity/node/Group.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "人群")
 public class Group extends BaseNode  {

src/main/java/com/diagbot/entity/node/LIS.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "实验室检查")
 public class LIS extends BaseNode  {

src/main/java/com/diagbot/entity/node/Medicine.java

@@ -1,10 +1,9 @@
 package com.diagbot.entity.node;
 
-import com.diagbot.entity.relationship.Medicine_AgeMin;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -13,8 +12,9 @@ import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Setter
+@Getter
+@EqualsAndHashCode(callSuper = true)
 @NodeEntity(label = "药品通用名")
 public class Medicine extends BaseNode implements Serializable {
 
@@ -27,11 +27,9 @@ public class Medicine extends BaseNode implements Serializable {
     @Relationship(type = "药品通用名禁忌性别", direction = Relationship.OUTGOING)
     private Gender gender;
 
-
     @Relationship(type = "药品通用名禁忌临床表现", direction = Relationship.OUTGOING)
     private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
 
-
     @Relationship(type = "药品通用名禁忌实验室检查", direction = Relationship.OUTGOING)
     private Set<LIS> lisset = new HashSet<>();
 

src/main/java/com/diagbot/entity/node/Operation.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "手术")
 public class Operation extends BaseNode  {

src/main/java/com/diagbot/entity/node/PACS.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "辅助检查")
 public class PACS extends BaseNode  {

src/main/java/com/diagbot/entity/node/Procedure.java

@@ -3,6 +3,8 @@ package com.diagbot.entity.node;
 import lombok.Data;
 import com.diagbot.entity.node.base.BaseNode;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
@@ -10,7 +12,8 @@ import org.neo4j.ogm.annotation.Relationship;
 import java.io.Serializable;
 import java.util.Set;
 
-//@Data
+@Setter
+@Getter
 //@EqualsAndHashCode(callSuper = false)
 @NodeEntity(label = "操作")
 public class Procedure extends BaseNode  {

src/main/java/com/diagbot/entity/node/base/BaseNode.java

@@ -1,7 +1,10 @@
 package com.diagbot.entity.node.base;
 
-import jdk.nashorn.internal.objects.annotations.Property;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
 import java.io.Serializable;
@@ -14,7 +17,8 @@ import java.util.Set;
  * @author: MarkHuang
  * @time: 2020/3/23 15:30
  */
-@Data
+@Setter
+@Getter
 public class BaseNode implements Serializable {
     @Id
     @GeneratedValue

src/main/java/com/diagbot/repository/MedicineNode.java

@@ -12,6 +12,7 @@ public class MedicineNode {
     public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine) {
         DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
 
+
         AgeMin ageMin = medicine.getAgeMin();
         String ageMin_val = (ageMin==null)?"":ageMin.getName();
         ageMin_val = ageMin_val.replace(age_ch, "").trim();