首程

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

@@ -29,7 +29,7 @@ public class FIRC0088 extends QCCatalogue {
         Map<String, String> firstCourseStructureMap = firstCourseRecordDoc.getStructureMap();
         String diffDiag = firstCourseStructureMap.get("鉴别诊断");
         if (StringUtil.isBlank(diffDiag) || diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别")
-                || diffDiag.contains("明确诊断")) {
+                || diffDiag.contains("明确诊断") || diffDiag.contains("诊断尚明确")) {
             return;
         }
         DiagLabel differentialDiagLabel = firstCourseRecordDoc.getDifferentialDiagLabel();

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

@@ -14,6 +14,8 @@ import java.util.Map;
 /**
  * @ClassName : FIRC02910
  * @Description : 首次病程创建时间早于患者入院时间
+ * 首程入院时间
+ * 首程记录时间
  * @Author : 胡敬
  * @Date: 2020-06-12 14:12
  */
@@ -29,7 +31,8 @@ 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 = beHospitalizedMap.get("入院日期");
+        String beHospitalDateStr = firstRecordMap.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/threelevelward/THR02986.java

@@ -58,8 +58,11 @@ public class THR02986 extends QCCatalogue {
         }
         String infoStr = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
         for (Map.Entry<Date, String> doctorAdviceDrug : doctorAdviceDrugMap.entrySet()) {
             Date doctorAdviceDate = doctorAdviceDrug.getKey();
+            String format = sdf1.format(doctorAdviceDate);
+            doctorAdviceDate = StringUtil.parseDateTime(format);
             Set<String> splitDrugs = CatalogueUtil.getRegexWords(doctorAdviceDrug.getValue(), "[(（\\[][^\\[\\]()（）]+[\\]）)]");
 
             boolean isFind = false;
@@ -100,9 +103,12 @@ public class THR02986 extends QCCatalogue {
         for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> wardDocStructureMap = threeLevelWardDoc.getStructureMap();
             String wardDateStr = wardDocStructureMap.get("查房日期");
+            if(StringUtils.isNotBlank(wardDateStr)){
+                wardDateStr = wardDateStr.split(" ")[0];
+            }
             String content = wardDocStructureMap.get("病情记录") + wardDocStructureMap.get("治疗计划和措施");
             Date wardDate = StringUtil.parseDateTime(wardDateStr);
-            if (doctorAdviceDate.before(wardDate) && !CatalogueUtil.compareTime(doctorAdviceDate, wardDate, days * 24 * 60L)) {
+            if ((doctorAdviceDate.before(wardDate) || doctorAdviceDate.equals(wardDate)) && !CatalogueUtil.compareTime(doctorAdviceDate, wardDate, days * 24 * 60L)) {
                 if (content.contains(drug)) {
                     matchSum++;
                 }