开单合理项维护

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

@@ -33,7 +33,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -156,10 +155,10 @@ public class BillManFacade {
                 = EntityUtil.makeMapWithKeyValue(dicIndicationManType, "val", "name");
         Map<String, String> dicBillConditionTypeMap
                 = EntityUtil.makeMapWithKeyValue(dicBillConditionType, "name", "val");
-        if (dicIndicationManTypeMap.containsKey(conditionIndexVO.getType().toString())
+        /*if (dicIndicationManTypeMap.containsKey(conditionIndexVO.getType().toString())
                 && dicTypeConvertMap.containsKey(dicIndicationManTypeMap.get(conditionIndexVO.getType().toString()))) {
             conditionIndexVO.setConceptLabel(dicTypeConvertMap.get(dicIndicationManTypeMap.get(conditionIndexVO.getType().toString())));
-        }
+        }*/
         //条件明细筛选范围
         List<String> conditionLabels = Lists.newArrayList();
         List<String> relationTypes = billManRepository.getRelationTypes(conditionIndexVO.getConceptLabel());
@@ -172,12 +171,12 @@ public class BillManFacade {
             }
         }
         //排除项
-        List<BillCondition> notInConditions
-                = billManRepository.getNotInConditions(conditionIndexVO.getConceptName(), conditionIndexVO.getConceptLabel());
         List<Long> notInIds = Lists.newArrayList();
+       /* List<BillCondition> notInConditions
+                = billManRepository.getNotInConditions(conditionIndexVO.getConceptName(), conditionIndexVO.getConceptLabel());
         if (ListUtil.isNotEmpty(notInConditions)) {
             notInIds = notInConditions.stream().map(i -> i.getId()).distinct().collect(Collectors.toList());
-        }
+        }*/
         List<BillCondition> conditions = billManRepository.conditionIndex(conditionLabels,
                 notInIds,
                 conditionIndexVO.getConditionName(),