|
@@ -66,7 +66,7 @@ public class OPE03322 extends QCCatalogue {
|
|
|
List<Diag> diagLists = initialDiagLabel.getDiags();
|
|
|
if (ListUtil.isNotEmpty(diagLists)) {
|
|
|
diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) ||
|
|
|
- diag.getHospitalDiagName().matches(rex) || diag.getHospitalDiagName().contains("胎膜早破") )).forEach(diag ->
|
|
|
+ diag.getHospitalDiagName().matches(rex) || diag.getHospitalDiagName().contains("胎膜早破"))).forEach(diag ->
|
|
|
diagList.add(diag.getHospitalDiagName()));
|
|
|
}
|
|
|
|
|
@@ -95,7 +95,7 @@ public class OPE03322 extends QCCatalogue {
|
|
|
if (StringUtil.isNotEmpty(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) || diagMap.get("诊断名称").contains("胎膜早破") )).forEach(diagMap ->
|
|
|
+ diagMap.get("诊断名称").matches(rex) || diagMap.get("诊断名称").contains("胎膜早破"))).forEach(diagMap ->
|
|
|
diagList.add(diagMap.get("诊断名称")));
|
|
|
}
|
|
|
}
|
|
@@ -125,18 +125,21 @@ public class OPE03322 extends QCCatalogue {
|
|
|
if (StringUtil.isEmpty(operationDiagZ) && StringUtil.isEmpty(operationDiagO)) {
|
|
|
continue;
|
|
|
}
|
|
|
- for (String diagCollectName : diagCollectList) {
|
|
|
- if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
- if (StringUtil.isNotEmpty(operationDiagZ)) {
|
|
|
- if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
|
|
|
- status.set("0");
|
|
|
- return;
|
|
|
+ for (String diagCollect : diagCollectList) {
|
|
|
+ String[] split = diagCollect.split(" ");
|
|
|
+ for (String diagCollectName : split) {
|
|
|
+ if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
+ if (StringUtil.isNotEmpty(operationDiagZ)) {
|
|
|
+ if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (StringUtil.isNotEmpty(operationDiagO)) {
|
|
|
- if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
|
|
|
- status.set("0");
|
|
|
- return;
|
|
|
+ if (StringUtil.isNotEmpty(operationDiagO)) {
|
|
|
+ if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -162,7 +165,7 @@ public class OPE03322 extends QCCatalogue {
|
|
|
JSONObject dataContent = data.getJSONObject(0);
|
|
|
likeRate = dataContent.getDoubleValue("like_rate");
|
|
|
}
|
|
|
- if (likeRate > 0.9) {
|
|
|
+ if (likeRate > 0.7) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|