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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC02910.java

@@ -14,8 +14,6 @@ import java.util.Map;
 /**
  * @ClassName : FIRC02910
  * @Description : 首次病程创建时间早于患者入院时间
- * 首程入院时间
- * 首程记录时间
  * @Author : 胡敬
  * @Date: 2020-06-12 14:12
  */
@@ -31,8 +29,7 @@ public class FIRC02910 extends QCCatalogue {
         Map<String, String> firstRecordMap = firstCourseRecordDoc.getStructureMap();
         Map<String, String> beHospitalizedMap = beHospitalizedDoc.getStructureMap();
         String createDateStr = firstRecordMap.get("记录时间");
-//        String beHospitalDateStr = beHospitalizedMap.get("入院日期");
-        String beHospitalDateStr = firstRecordMap.get("入院日期");
+        String beHospitalDateStr = beHospitalizedMap.get("入院日期");
         if (StringUtil.isNotBlank(createDateStr) && StringUtil.isNotBlank(beHospitalDateStr)) {
             Date createDate = StringUtil.parseDateTime(createDateStr);
             Date beHospitalDate = StringUtil.parseDateTime(beHospitalDateStr);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0190.java

@@ -41,6 +41,7 @@ public class FIRP0190 extends QCCatalogue {
                 bloodType = clinicalBloodDoc.getStructureMap().get("Rh血型");
             }
             if (StringUtils.isEmpty(bloodType)) {
+                noRhSum++;
                 continue;
             }
             if (!bloodType.contains("阴") && !bloodType.contains("阳")) {