Merge branch 'dev-1.2' of http://192.168.2.236:10080/louhr/qc into dev-1.2

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

@@ -23,7 +23,7 @@ public class BEH02922 extends QCCatalogue {
             return;
         }
         Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        if (StringUtil.isBlank(beHospitalStructureMap.get("桡动脉脉率"))) {
+        if (StringUtil.isBlank(beHospitalStructureMap.get("脉搏"))) {
             status.set("-1");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0602.java

@@ -60,10 +60,13 @@ public class THR0602 extends QCCatalogue {
                     allDoctorWradDocs,
                     operationEndDateStr,
                     48 * 60);
-            if (!doctorRecord.containsKey("主刀")) {
-                status.set("-1");
-                return;
+            if(doctorRecord != null && doctorRecord.size()>0){
+                if (!doctorRecord.containsKey("主刀")) {
+                    status.set("-1");
+                    return;
+                }
             }
+
         }