Ver código fonte

规则预处理开单项修改判断非空方式

hujing 5 anos atrás
pai
commit
7901b84d74

+ 4 - 4
common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -140,7 +140,7 @@ public class PretreatmentRule {
             add2PreResultList(searchData.getLisOrder(), "", "lisOrder", searchData);
         }
         //开具 检查
-        if (!StringUtils.isEmpty(searchData.getPacsOrder())) {
+        if (searchData.getPacsOrder() != null && searchData.getPacsOrder().size() > 0) {
             List<PreResult> preResults = searchData.getPacsOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
@@ -149,7 +149,7 @@ public class PretreatmentRule {
             add2PreResultList(searchData.getPacsOrder(), "", "pacsOrder", searchData);
         }
         //开具 诊断
-        if (!StringUtils.isEmpty(searchData.getDiagOrder())) {
+        if (searchData.getDiagOrder() != null && searchData.getDiagOrder().size() > 0) {
             List<PreResult> preResults = searchData.getDiagOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
@@ -158,7 +158,7 @@ public class PretreatmentRule {
             add2PreResultList(searchData.getDiagOrder(), "", "diagOrder", searchData);
         }
         //开具 药品
-        if (!StringUtils.isEmpty(searchData.getDrugOrder())) {
+        if (searchData.getDrugOrder() != null && searchData.getDrugOrder().size() > 0) {
             List<PreResult> preResults = searchData.getDrugOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
@@ -167,7 +167,7 @@ public class PretreatmentRule {
             add2PreResultList(searchData.getDrugOrder(), "", "drugOrder", searchData);
         }
         //开具 手术
-        if (!StringUtils.isEmpty(searchData.getOperationOrder())) {
+        if (searchData.getOperationOrder() != null && searchData.getOperationOrder().size() > 0) {
             List<PreResult> preResults = searchData.getOperationOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());