rengb 5 роки тому
батько
коміт
8889499159

+ 7 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0034.java

@@ -30,7 +30,13 @@ public class BEH0034 extends QCCatalogue {
             return;
         }
         List<String> wtOperationNames = CatalogueUtil.noInQuotes(
-                operations.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).distinct().collect(Collectors.toList()),
+                operations.stream()
+                        .filter(i ->
+                                i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
+                        )
+                        .map(i -> i.getName())
+                        .distinct()
+                        .collect(Collectors.toList()),
                 pastLabel.getText()
         );
         if (ListUtil.isNotEmpty(wtOperationNames)) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -73,7 +73,7 @@ public class CatalogueUtil {
             List<String> sections = Lists.newArrayList();
             int index = 0;
             for (String txt : text.split("\"")) {
-                if (index % 2 == 1) {
+                if (index % 2 == 1 && text.indexOf("\"", text.indexOf(txt)) > -1) {
                     sections.add(txt);
                 }
                 index++;