Просмотр исходного кода

处理化验(关系id大到小、找不到uniqueName)

kongwz 4 лет назад
Родитель
Сommit
37bb2158a9

+ 16 - 10
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -309,22 +309,19 @@ public class CommonFacade {
                             }
 
                         }else {
-                            Lis lis = new Lis();
-                            lis.setUnits(unit);
-                            lis.setValue(Double.parseDouble(value));
-                            lis.setDetailName(detailName);
-                            lis.setName(bigName);
+                            Lis lis = getLis(bigName, detailName, value, unit);
                             lisList.add(lis);
                         }
                     }else {
-                        Lis lis = new Lis();
-                        lis.setUnits(unit);
-                        lis.setValue(Double.parseDouble(value));
-                        lis.setDetailName(detailName);
-                        lis.setName(bigName);
+                        Lis lis = getLis(bigName, detailName, value, unit);
                         lisList.add(lis);
                     }
                 });
+            }else {
+                lises.stream().forEach(x ->{
+                    Lis lis = getLis(x.getBigItem().getName(), x.getName(), x.getPd().getValue(), x.getPd().getUnit());
+                    lisList.add(lis);
+                });
             }
         }
         //处理辅检
@@ -362,5 +359,14 @@ public class CommonFacade {
         pacsLabel.getPacsNewList().addAll(packagePacs);
         wordCrfDTO.setPacsLabel(pacsLabel);
     }
+
+    private Lis getLis(String bigName, String detailName, String value, String unit) {
+        Lis lis = new Lis();
+        lis.setUnits(unit);
+        lis.setValue(Double.parseDouble(value));
+        lis.setDetailName(detailName);
+        lis.setName(bigName);
+        return lis;
+    }
 }
 

+ 3 - 0
src/main/java/com/diagbot/model/ai/process/EntityProcessLis.java

@@ -103,6 +103,9 @@ public class EntityProcessLis extends EntityProcess {
             if(EntityEnum.LABORATORY_BIG.toString().equals(relationsJSONObject.getString("name"))){
                 int from = relationsJSONObject.getIntValue("from");
                 int to = relationsJSONObject.getIntValue("to");
+                if(from > to){
+                    continue;
+                }
                 if(from_to.containsKey(from)){
                     List<Integer> toList = from_to.get(from);
                     toList.add(to);