北仑，查房记录存在第一个主刀查房，判断是否在手术记录之前

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

@@ -40,11 +40,12 @@ public class OPE0369 extends QCCatalogue {
                 return;
             }
 //            Map<Date, String> operationDateNameMap = Maps.newLinkedHashMap();
+            String operationStartDate = "";
             List<Date> operDateList = new ArrayList<>();
             for (OperationDoc operationDoc : operationDocs) {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
-                    String operationStartDate = operationDocStructureMap.get("手术开始时间");
+                    operationStartDate = operationDocStructureMap.get("手术开始时间");
                     if (StringUtil.isNotBlank(operationStartDate)) {
                         operDateList.add(StringUtil.parseDateTime(operationStartDate));
                     }
@@ -74,9 +75,16 @@ public class OPE0369 extends QCCatalogue {
             for (ThreeLevelWardDoc threeLevelWard : allDoctorWradDocs) {
                 Map<String, String> structureMap = threeLevelWard.getStructureMap();
                 String makeTitle = structureMap.get("查房标题");
-                if (makeTitle.contains("术前主刀")) {
+                if (makeTitle.contains("术前") && makeTitle.contains("主刀")) {
                     operateCount++;
                 }
+                if (operateCount == 0 && makeTitle.contains("主刀")) {
+                    String recordDateStr = structureMap.get("查房日期");
+                    if (StringUtil.isNotBlank(recordDateStr) && StringUtil.isNotBlank(operationStartDate) &&
+                            StringUtil.parseDateTime(recordDateStr).before(StringUtil.parseDateTime(operationStartDate))) {
+                        operateCount++;
+                    }
+                }
             }
         }