Merge remote-tracking branch 'origin/master'

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

@@ -17,10 +17,10 @@ import java.util.Set;
 public class LISPack extends BaseNode  {
 
     @Property(name = "最大值")
-    private String maxval;
+    private Double maxval;
 
     @Property(name = "最小值")
-    private String minval;
+    private Double minval;
 
     @Property(name = "单位")
     private String unit;

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

@@ -26,6 +26,9 @@ public class Vital extends BaseNode  {
     @Property(name = "单位")
     private String unit;
 
+    @Property(name = "范围")
+    private Integer range;
+
     @Relationship(type="疾病相关体征", direction = Relationship.INCOMING)
     private Set<Disease> diseases;
 

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

@@ -267,29 +267,35 @@ public class RetrievalFacade {
             operationRetList.add(staticDTO);
         }
         //0-全部、1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作
-        if (types.contains(1)) {
+        if (types.contains(0)) {
             retList.addAll(disRetList);
-        } else if (types.contains(2)) {
             retList.addAll(drugRetList);
-        } else if (types.contains(3)) {
-            //检索的套餐
             retList.addAll(lisPackRetList);
-            //明细关联出的套餐
             retList.addAll(lisPackRelatecLisRetList);
-            //明细
             retList.addAll(lisRetList);
-        } else if (types.contains(5)) {
             retList.addAll(pacsRetList);
-        } else if (types.contains(6)) {
             retList.addAll(operationRetList);
         } else {
-            retList.addAll(disRetList);
-            retList.addAll(drugRetList);
-            retList.addAll(lisPackRetList);
-            retList.addAll(lisPackRelatecLisRetList);
-            retList.addAll(lisRetList);
-            retList.addAll(pacsRetList);
-            retList.addAll(operationRetList);
+            if (types.contains(1)) {
+                retList.addAll(disRetList);
+            }
+            if (types.contains(2)) {
+                retList.addAll(drugRetList);
+            }
+            if (types.contains(3)) {
+                //检索的套餐
+                retList.addAll(lisPackRetList);
+                //明细关联出的套餐
+                retList.addAll(lisPackRelatecLisRetList);
+                //明细
+                retList.addAll(lisRetList);
+            }
+            if (types.contains(5)) {
+                retList.addAll(pacsRetList);
+            }
+            if (types.contains(6)) {
+                retList.addAll(operationRetList);
+            }
         }
         return retList;
     }

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

@@ -114,7 +114,7 @@ public class PACSNode {
 
         PacsBillNeoDTO pacsBillNeoDTO;
 
-        PACS pacs;
+        List<PACS> pacslt;
         String pacsname;
 
         for (String term : pacsterm.keySet()) {
@@ -125,10 +125,10 @@ public class PACSNode {
 
             pacsBillNeoDTO = new PacsBillNeoDTO();
 
-            pacs = pacsRepository.findByNameIs(pacsname).get(0);
+            pacslt = pacsRepository.findByNameIs(pacsname);
 
-            if (pacs != null) {
-                pacsBillNeoDTO = PacstoPACSDTO(pacs);
+            if (pacslt != null && pacslt.size()>0) {
+                pacsBillNeoDTO = PacstoPACSDTO(pacslt.get(0));
             }
 
             billNeoDTO.setPacsBillNeoDTO(pacsBillNeoDTO);