Explorar o código

1、修改病案首页RH填写错误

louhr %!s(int64=5) %!d(string=hai) anos
pai
achega
9812cbfe1a

+ 8 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0190.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,9 +33,13 @@ public class FIRP0190 extends QCCatalogue {
             status.set("-1");
             for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocList) {
                 String bloodType = clinicalBloodDoc.getStructureMap().get("输注种类、血型、数量");
-                if (bloodType.contains(Content.rhFactor) &&
-                        bloodType.substring(bloodType.indexOf(Content.rhFactor))
-                                .contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
+                if (StringUtils.isEmpty(bloodType)) {
+                    continue;
+                }
+                bloodType = bloodType.toUpperCase();
+                String rh = Content.rhFactor.toUpperCase();
+                if (bloodType.contains(rh) &&
+                        bloodType.contains(CatalogueUtil.removeSpecialChar(rhFactor))) {
                     status.set("0");
                     return;
                 }