Merge branch 'hb/beilun' of http://192.168.2.236:10080/louhr/qc into hb/beilun

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

@@ -78,6 +78,9 @@ public class CRI0382 extends QCCatalogue {
                     companyNum = companyNum.replaceAll("单位：", "");
                 }
             }
+            if (crisisName.matches("[\\s\\S]*[(?==)][^,;，；。]{0,8}(?=秒)[\\s\\S]*")) {
+                crisisName = crisisName.split("=")[0];
+            }
             allCrisises.add(reptTime);
             if (StringUtils.isNotEmpty(reptTime)) {
                 //当前时间和报告时间未超过6小时，规则通过

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0347.java

@@ -20,7 +20,7 @@ public class DEAR0347 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getDeathRecordDoc() != null && inputInfo.getDeathRecordDoc().getStructureMap() != null) {
             Map<String, String> deathRecordStructureMap = inputInfo.getDeathRecordDoc().getStructureMap();
-            if (CatalogueUtil.isEmpty(deathRecordStructureMap.get("死亡时间"))) {
+            if (CatalogueUtil.isEmpty(deathRecordStructureMap.get("死亡时间")) && CatalogueUtil.isEmpty(deathRecordStructureMap.get("死亡日期"))) {
                 status.set("-1");
             }
         }