北仑：手术患者缺术前主刀医师查房手术次数大于术前主刀查房次数提示缺陷

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/leavehospital/LEA0148.java

@@ -35,7 +35,7 @@ public class LEA0148 extends QCCatalogue {
             Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
             timeCy = medicalRecordInfoStructureMap.get("leaveHospitalDate");
         }
-        String timeQm = leaveHospitalDoc.getStructureMap().get("签名时间");
+        String timeQm = leaveHospitalDoc.getStructureMap().get("记录时间");
         if (StringUtil.isNotBlank(timeQm) && StringUtil.isNotBlank(timeCy)) {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(timeCy),

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/operationdiscussion/OPE0369.java

@@ -74,9 +74,11 @@ public class OPE0369 extends QCCatalogue {
 
             if (operDateList.size() > 1) {
                 for (int i = 0; i < operDateList.size(); i++) {
-                    if (CatalogueUtil.compareTime(operDateList.get(i), operDateList.get(i + 1),
-                            Long.valueOf(24 * 60))) {//如果手术记录是同一天，需有一次术前主刀查房
-                        operationCount--;
+                    if (i + 1 < operDateList.size()) {
+                        if (!CatalogueUtil.compareTime(operDateList.get(i), operDateList.get(i + 1),
+                                Long.valueOf(24 * 60))) {//如果手术记录是同一天，需有一次术前主刀查房
+                            operationCount--;
+                        }
                     }
                 }
             }
@@ -92,7 +94,7 @@ public class OPE0369 extends QCCatalogue {
                     for (Date date : operDateList) {
                         if (StringUtil.isNotBlank(recordDateStr) && date != null
                                 && StringUtil.parseDateTime(recordDateStr).before(date)) {
-                            if (CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
+                            if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
                                     && (makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))) {
                                 operateCount++;
                             }
@@ -104,7 +106,7 @@ public class OPE0369 extends QCCatalogue {
             }
         }
 
-        if (operationCount != operateCount) {
+        if (operationCount > operateCount) {
             status.set("-1");
             return;
         }