Merge remote-tracking branch 'origin/master'

pom.xml

@@ -194,19 +194,22 @@
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.neo4j</groupId>
-            <artifactId>neo4j-ogm-http-driver</artifactId>
-            <version>3.2.11</version>
+            <artifactId>neo4j-ogm-core</artifactId>
+            <version>3.2.2</version>
+            <scope>compile</scope>
         </dependency>
 
 
         <dependency>
             <groupId>org.neo4j</groupId>
-            <artifactId>neo4j-ogm-bolt-driver</artifactId>
-            <version>3.2.9</version>
+            <artifactId>neo4j-ogm-http-driver</artifactId>
+            <version>3.2.11</version>
         </dependency>
 
+
         <!-- 文件上传相关�?? -->
         <dependency>
             <groupId>commons-beanutils</groupId>

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

@@ -27,6 +27,9 @@ public class LisName extends BaseNode  {
 	@Property(name = "范围")
 	private Integer range;
 
+	@Property(name = "静态知识")
+	private String knowledge;
+
 	@Relationship(type = "实验室检查名称相关实验室检查代码", direction = Relationship.OUTGOING)
 	private Set<LisCode> liscodes = new HashSet<>();
 

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

@@ -0,0 +1,42 @@
+package com.diagbot.entity.node;
+
+import com.diagbot.entity.node.base.BaseNode;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "实验室检查结果")
+public class LisResult extends BaseNode  {
+
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Property(name = "性别")
+	private String gender;
+
+	@Property(name = "年龄最大值")
+	private Integer maxage;
+
+	@Property(name = "年龄最小值")
+	private Integer minage;
+
+	@Relationship(type = "实验室检查结果相关医保疾病名称", direction = Relationship.OUTGOING)
+	private Set<YiBaoDiseaseName> disease = new HashSet<>();
+
+}

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

@@ -42,4 +42,7 @@ public class YiBaoDiseaseName extends BaseNode  {
 	@Relationship(type = "辅助检查名称相关医保疾病名称", direction = Relationship.INCOMING)
 	private Set<PacsName> pacsnames = new HashSet<>();
 
+	@Relationship(type = "实验室检查结果相关医保疾病名称", direction = Relationship.INCOMING)
+	private Set<LisResult> lisresults = new HashSet<>();
+
 }

src/main/java/com/diagbot/facade/BillFacade.java

@@ -77,9 +77,9 @@ public class BillFacade {
     public BillNeoVO fillBillNeo(WordCrfDTO wordCrfDTO) {
         BillNeoVO billNeoVO = new BillNeoVO();
 
-        List<Drug> items = wordCrfDTO.getDrugOrder();
+        List<Drug> drugs = wordCrfDTO.getDrugOrder();
 
-        for (Item item : items) {
+        for (Drug item : drugs) {
             billNeoVO.getDrugList().put(item.getName(), item.getUniqueName());
         }