|
@@ -33,8 +33,6 @@ import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
-import java.util.concurrent.atomic.AtomicReference;
|
|
|
-import java.util.concurrent.locks.ReentrantLock;
|
|
|
|
|
|
/**
|
|
|
* @description: 通用规则提取
|
|
@@ -424,36 +422,6 @@ public class CommonRule {
|
|
|
highRiskList.add(billMsg);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- public static void main(String[] args) {
|
|
|
- List<Pacs> pacsList = new ArrayList<>();
|
|
|
- Pacs pacs = new Pacs();
|
|
|
- pacs.setName("d1");
|
|
|
- pacs.setDateValue("2020-01-01");
|
|
|
- pacsList.add(pacs);
|
|
|
-
|
|
|
- Pacs pacs1 = new Pacs();
|
|
|
- pacs1.setName("d2");
|
|
|
- pacs1.setDateValue("2020-01-07");
|
|
|
- pacsList.add(pacs1);
|
|
|
-
|
|
|
- Pacs pacs3 = new Pacs();
|
|
|
- pacs3.setName("d3");
|
|
|
- pacs3.setDateValue("2020-01-09");
|
|
|
- pacsList.add(pacs3);
|
|
|
- CommonRule commonRule = new CommonRule();
|
|
|
- commonRule.sortByProperty(pacsList, "dateValue");
|
|
|
- for (Pacs bean : pacsList) {
|
|
|
- System.out.println(bean.getName());
|
|
|
- }
|
|
|
- AtomicReference<Integer> integerAtomicReference = new AtomicReference<>(20);
|
|
|
- integerAtomicReference.set(1020);
|
|
|
- new ReentrantLock().lock();
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 根据基础规则,通用
|
|
|
*
|
|
@@ -471,7 +439,11 @@ public class CommonRule {
|
|
|
RuleBaseDTO ruleBaseDTO = new RuleBaseDTO();
|
|
|
BeanUtil.copyProperties(base, ruleBaseDTO);
|
|
|
String baseIds = base.getIds();
|
|
|
- switch (BaseDiagnoseTypeEnum.getEnum(base.getBaseType())) {
|
|
|
+ BaseDiagnoseTypeEnum baseEnum = BaseDiagnoseTypeEnum.getEnum(base.getBaseType());
|
|
|
+ if (baseEnum == null) { // 防止报空指针
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ switch (baseEnum) {
|
|
|
case equals: // 等于术语本身
|
|
|
switch (LexiconEnum.getEnum(base.getBaseLibType())) {
|
|
|
case Symptom: // 症状
|
|
@@ -517,5 +489,4 @@ public class CommonRule {
|
|
|
Collections.sort(baseIdList); // id排序,方便调试查看
|
|
|
return baseIdList;
|
|
|
}
|
|
|
-
|
|
|
}
|