Merge remote-tracking branch 'origin/master'

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

@@ -11,6 +11,7 @@ import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
@@ -26,34 +27,34 @@ public class Operation extends BaseNode  {
     private Gender gender;
 
     @Relationship(type = "手术和操作禁忌体征", direction = Relationship.OUTGOING)
-    private Set<Vital> vitals;
+    private Set<Vital> vitals = new HashSet<>();
 
     @Relationship(type = "手术和操作禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalFindings;
+    private Set<ClinicalFinding> clinicalFindings = new HashSet<>();
 
     @Relationship(type = "手术和操作禁忌实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> conflict_lis;
+    private Set<LIS> conflict_lis = new HashSet<>();
 
     @Relationship(type = "手术和操作禁忌服用药品", direction = Relationship.OUTGOING)
-    private Set<OralMedicine> oralMedicines;
+    private Set<OralMedicine> oralMedicines = new HashSet<>();
 
     @Relationship(type = "手术和操作禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> conflict_diseases;
+    private Set<Disease> conflict_diseases = new HashSet<>();
 
     @Relationship(type = "手术和操作禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups;
+    private Set<Group> groups = new HashSet<>();
 
     @Relationship(type="疾病相关手术和操作", direction = Relationship.INCOMING)
-    private Set<Disease> diseases;
+    private Set<Disease> diseases = new HashSet<>();
 
     @Relationship(type="药品通用名禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+    private Set<Medicine> medicines = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+    private Set<PACS> pacs = new HashSet<>();
 
     @Relationship(type="实验室检查禁忌手术和操作", direction = Relationship.INCOMING)
-    private Set<LIS> lis;
+    private Set<LIS> lis = new HashSet<>();
 }
 
 

src/main/java/com/diagbot/vo/PushPlanVO.java

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import com.diagbot.biz.push.entity.Item;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,8 +11,4 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PushPlanVO extends SearchData {
-    /**
-     * 选中手术
-     */
-    private Item operationName;
 }

src/main/java/com/diagbot/vo/SearchData.java

@@ -161,4 +161,8 @@ public class SearchData extends HospitalBaseVO {
      * 选中诊断
      */
     private Item diseaseName;
+    /**
+     * 选中手术
+     */
+    private Item operationName;
 }