Merge remote-tracking branch 'origin/shaoyf/dev' into shaoyf/master

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02909.java

@@ -30,6 +30,7 @@ public class BEH02909 extends QCCatalogue {
             return;
         }
         String drugsCurrentlyInUse = inputInfo.getBeHospitalizedDoc().getStructureMap().get("长期用药");
+        drugsCurrentlyInUse += inputInfo.getBeHospitalizedDoc().getStructureMap().get("外院用药");
         if (StringUtil.isBlank(drugsCurrentlyInUse)) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/crisisvaluereport/CRI0382.java

@@ -59,6 +59,7 @@ public class CRI0382 extends QCCatalogue {
         crisisInfoDocs.forEach(crisisInfoDoc -> {
             String reptTime = crisisInfoDoc.getStructureMap().get("报告时间");
             String crisisName = crisisInfoDoc.getStructureMap().get("危急值名称");
+            crisisName = crisisName ==null? "":crisisName.split("\\[|\\(|\\（")[0];
             allCrisises.add(reptTime);
             if (StringUtils.isNotEmpty(reptTime)) {
                 //当前时间和报告时间未超过6小时，规则通过