Merge remote-tracking branch 'origin/master'

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

@@ -6,11 +6,11 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 @Setter
 @Getter
@@ -18,6 +18,9 @@ import java.util.Set;
 @NodeEntity(label = "药品通用名")
 public class Medicine extends BaseNode implements Serializable {
 
+    @Property(name = "高危级别")
+    private String risklevel;
+
     @Relationship(type = "药品通用名禁忌性别", direction = Relationship.OUTGOING)
     private Gender gender;
 

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

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
@@ -18,6 +19,9 @@ import java.util.Set;
 @NodeEntity(label = "手术和操作")
 public class Operation extends BaseNode  {
 
+    @Property(name = "高危级别")
+    private String risklevel;
+
     @Relationship(type="疾病相关手术和操作", direction = Relationship.INCOMING)
     private Set<Disease> diseases;
 

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

@@ -19,6 +19,7 @@ import java.util.Set;
  */
 @Setter
 @Getter
+@NodeEntity(label = "")
 public class BaseNode implements Serializable {
     @Id
     @GeneratedValue

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

@@ -197,6 +197,11 @@ public class MedicineNode {
             highRiskNeoDTO.setStandname(drugname);
 
             medicine = medicineRepository.findByNameIs(drugname);
+
+            if (null != medicine && null!=medicine.getRisklevel() && medicine.getRisklevel().trim().length()>0) {
+                highRiskNeoDTO.setIsHighrisk(true);
+
+            }
         }
 
         return highRiskNeoDTOS;

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

@@ -53,6 +53,11 @@ public class OperationNode {
             highRiskNeoDTO.setStandname(opname);
 
             operation = operationRepository.findByNameIs(opname);
+
+            if (null != operation && null!=operation.getRisklevel() && operation.getRisklevel().trim().length()>0) {
+                highRiskNeoDTO.setIsHighrisk(true);
+
+            }
         }
 
         return highRiskNeoDTOS;