厦门：主任+主任查房算是一次主治查房

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0128.java

@@ -162,7 +162,7 @@ public class THR0128 extends QCCatalogue {
     private int endocrinologyTitleNum(String[] srcText) {
         int count = 0;
         for (String title : srcText) {
-            String regex = ".*科主任.*主任.*";
+            String regex = ".*主任.*主任.*";
             if (title.matches(regex)) {
                 count++;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0588.java

@@ -44,6 +44,7 @@ public class THR0588 extends QCCatalogue {
                 leaveDate = new Date();
             }
         }
+
         //查房记录
         List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
         if (threeLevelWardDocs.size() == 0) {
@@ -52,6 +53,17 @@ public class THR0588 extends QCCatalogue {
         //所有查房记录的日期天
         List<Date> dateThreeLevelDay = new ArrayList<>();
         StringBuffer sb = new StringBuffer();
+
+        /******************************************首次病程********************************************************/
+        if (inputInfo.getFirstCourseRecordDoc() != null) {
+            Map<String, String> structureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
+            if (StringUtil.isNotBlank(structureMap.get("病历日期"))) {
+                Date recordDate = StringUtil.parseDateTime(structureMap.get("病历日期"));
+                dateThreeLevelDay.add(recordDate);
+            }
+        }
+
+        /******************************************查房记录********************************************************/
         //所有的查房记录
         List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
         for (ThreeLevelWardDoc doc : allDoctorWradDocs) {
@@ -61,14 +73,7 @@ public class THR0588 extends QCCatalogue {
             }
             dateThreeLevelDay.add(threeLevelDate);
         }
-        /******************************************首次病程********************************************************/
-        if (inputInfo.getFirstCourseRecordDoc() != null) {
-            Map<String, String> structureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
-            if (StringUtil.isNotBlank(structureMap.get("病历日期"))) {
-                Date recordDate = StringUtil.parseDateTime(structureMap.get("病历日期"));
-                dateThreeLevelDay.add(recordDate);
-            }
-        }
+
         /******************************************术后首程********************************************************/
         if (inputInfo.getOperationDocs().size() > 0) {
             List<String> recordDateList = inputInfo.getOperationDocs().stream().map(OperationDoc::getOperationDiscussionDoc).filter(Objects::nonNull)
@@ -82,6 +87,7 @@ public class THR0588 extends QCCatalogue {
                 dateThreeLevelDay.add(recordDate);
             }
         }
+
         /******************************************转入转出********************************************************/
         if (inputInfo.getTransferRecordDocs() != null) {
             TransferRecordDoc transferRecordDocs = inputInfo.getTransferRecordDocs();
@@ -106,6 +112,7 @@ public class THR0588 extends QCCatalogue {
                 dateThreeLevelDay.add(recordDate);
             }
         }
+
         /******************************************阶段小结********************************************************/
         if (inputInfo.getStagesSummaryDocs().size() > 0) {
             List<String> intoRecordDateList = inputInfo.getStagesSummaryDocs().stream().map(StagesSummaryDoc::getStructureMap)

trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenThreeLevelWardDocTrans.java

@@ -225,13 +225,13 @@ public class XiamenThreeLevelWardDocTrans extends ModelDocTrans {
     }
 
     /**
-     * 厦门科主任+主任查房处理
+     * 主任+主任查房处理
      *
      * @param title
      * @return
      */
     private boolean xiamenTitle(String title) {
-        String regex = ".*科主任.*主任.*";
+        String regex = ".*主任.*主任.*";
         return title.matches(regex);
     }