|
@@ -63,7 +63,7 @@ public class LEA03290 extends QCCatalogue {
|
|
if (initialDiagLabel != null) {
|
|
if (initialDiagLabel != null) {
|
|
List<Diag> diagLists = initialDiagLabel.getDiags();
|
|
List<Diag> diagLists = initialDiagLabel.getDiags();
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
- diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
|
|
|
|
+ diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -71,14 +71,14 @@ public class LEA03290 extends QCCatalogue {
|
|
if (revisedDiagLabel != null) {
|
|
if (revisedDiagLabel != null) {
|
|
List<Diag> diagLists = revisedDiagLabel.getDiags();
|
|
List<Diag> diagLists = revisedDiagLabel.getDiags();
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
- diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
|
|
|
|
+ diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (suppleDiagLabel != null) {
|
|
if (suppleDiagLabel != null) {
|
|
List<Diag> diagLists = suppleDiagLabel.getDiags();
|
|
List<Diag> diagLists = suppleDiagLabel.getDiags();
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
- diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&( diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
|
|
|
|
+ diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -87,7 +87,7 @@ public class LEA03290 extends QCCatalogue {
|
|
if (firstPageRecordDoc != null) {
|
|
if (firstPageRecordDoc != null) {
|
|
//获取出院诊断
|
|
//获取出院诊断
|
|
String leaveDiagStr = firstPageRecordDoc.getStructureMap().get("出院诊断");
|
|
String leaveDiagStr = firstPageRecordDoc.getStructureMap().get("出院诊断");
|
|
- if(StringUtil.isNotEmpty(leaveDiagStr)) {
|
|
|
|
|
|
+ if (StringUtil.isNotEmpty(leaveDiagStr)) {
|
|
List<Map<String, String>> leaveDiagList = (List<Map<String, String>>) JSONArray.parse(leaveDiagStr);
|
|
List<Map<String, String>> leaveDiagList = (List<Map<String, String>>) JSONArray.parse(leaveDiagStr);
|
|
leaveDiagList.stream().filter(diagMap -> StringUtil.isNotEmpty(diagMap.get("诊断名称")) && (diagListWords.contains(diagMap.get("诊断名称")) || diagMap.get("诊断名称").matches(rex))).forEach(diagMap ->
|
|
leaveDiagList.stream().filter(diagMap -> StringUtil.isNotEmpty(diagMap.get("诊断名称")) && (diagListWords.contains(diagMap.get("诊断名称")) || diagMap.get("诊断名称").matches(rex))).forEach(diagMap ->
|
|
diagList.add(diagMap.get("诊断名称")));
|
|
diagList.add(diagMap.get("诊断名称")));
|
|
@@ -105,22 +105,12 @@ public class LEA03290 extends QCCatalogue {
|
|
if (leaveHospitalDoc == null) {
|
|
if (leaveHospitalDoc == null) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
|
|
|
|
- if (leaveDiagLabel == null) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- List<Diag> diags = leaveDiagLabel.getDiags();
|
|
|
|
- if (ListUtil.isEmpty(diags)) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- for (Diag diag : diags) {
|
|
|
|
- String diagName = diag.getHospitalDiagName();
|
|
|
|
- for (String diagCollectName : diagCollectList) {
|
|
|
|
- if (StringUtil.isNotEmpty(diagName) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
|
- if (getLikeRate(diagName, diagCollectName)) {
|
|
|
|
- status.set("0");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ String leaveDiag = leaveHospitalDoc.getStructureMap().get("出院诊断");
|
|
|
|
+ for (String diagCollectName : diagCollectList) {
|
|
|
|
+ if (StringUtil.isNotEmpty(leaveDiag) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
|
+ if (getLikeRate(leaveDiag, diagCollectName) || leaveDiag.contains(diagCollectName)) {
|
|
|
|
+ status.set("0");
|
|
|
|
+ return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|