|
@@ -3071,15 +3071,13 @@ public class ConsoleFacade {
|
|
|
|
|
|
|
|
|
static Boolean isContainDiagnose(ReBeHosMergeDTO record){
|
|
|
- //切成最小单元进行诊断匹配
|
|
|
- String lastDiagnoseName = replace(record.getLastDiagnoseName());
|
|
|
- String diagnose =replace(record.getDiagnose());
|
|
|
- //对入院诊断多个诊断,分割
|
|
|
+ // String lastDiagnoseName = replace(record.getLastDiagnoseName());本身使用,分隔
|
|
|
+ String diagnose =replace(record.getDiagnose());//手动分隔
|
|
|
String lastDiagnose = replace(record.getLastDiagnose());
|
|
|
record.setDiagnose(diagnose);
|
|
|
record.setLastDiagnose(lastDiagnose);
|
|
|
- Set lastDiagnoseNames = strTranListMethod(lastDiagnoseName);
|
|
|
- Set diagnoses = strTranListMethod(diagnose);
|
|
|
+ Set lastDiagnoseNames = strTranListMethod(record.getLastDiagnoseName());
|
|
|
+ Set diagnoses = strTranListMethod(record.getDiagnose());
|
|
|
long count = diagnoses.stream().filter(obj ->null != lastDiagnoseNames && null != obj && lastDiagnoseNames.contains(obj)).count();
|
|
|
if(count<=0){
|
|
|
return false;
|