|
@@ -33,7 +33,7 @@ public class FIRP0190 extends QCCatalogue {
|
|
|
if (CatalogueUtil.isEmpty(rhFactor)) {
|
|
|
return;
|
|
|
}
|
|
|
- rhFactor = "RH" + rhFactor;
|
|
|
+// rhFactor = "RH" + rhFactor;
|
|
|
int matchSum = 0, noRhSum = 0;
|
|
|
for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
|
|
|
String bloodType = clinicalBloodDoc.getStructureMap().get("病情记录");
|
|
@@ -47,13 +47,23 @@ public class FIRP0190 extends QCCatalogue {
|
|
|
if (!bloodType.contains("阴") && !bloodType.contains("阳")) {
|
|
|
noRhSum++;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
bloodType = bloodType.toUpperCase();
|
|
|
- if (bloodType.contains(rhFactor)) {
|
|
|
- matchSum++;
|
|
|
+ if (bloodType.contains("RH")) {
|
|
|
+ if (rhFactor.contains("阴") && bloodType.contains("-")) {
|
|
|
+ matchSum++;
|
|
|
+ }
|
|
|
+ if (rhFactor.contains("阳") && bloodType.contains("+")) {
|
|
|
+ matchSum++;
|
|
|
+ }
|
|
|
+ if (bloodType.contains(rhFactor)) {
|
|
|
+ matchSum++;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
/* 如果所有输血记录都没有rh记录(阴、阳),则不报错 */
|
|
|
- if (noRhSum == clinicalBloodDocList.size()){
|
|
|
+ if (noRhSum == clinicalBloodDocList.size()) {
|
|
|
return;
|
|
|
}
|
|
|
if (matchSum == 0) {
|