每3天无1次主治医师查房记录(Fellow查房记录每3天1次)

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03016.java

@@ -90,7 +90,8 @@ public class THR03016 extends QCCatalogue {
             List<String> resultInfos = new ArrayList<>();
             for (int j = 0; j < recordDoctorEveryWeek.size(); j++) {
                 int attendNum = CatalogueUtil.appearNumber(recordDoctorEveryWeek.get(j).split(","), "F");
-                if (attendNum == 0) {
+                int attendNum2 = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.attend);
+                if (attendNum == 0 && attendNum2 == 0)  {
                     //每3天无1次主治医师查房记录
                     status.set("-1");
                     resultInfos.add(lastWardDateRangeList.get(j));
@@ -100,14 +101,14 @@ public class THR03016 extends QCCatalogue {
                 return;
             }
 
-            for (int j = 0; j < roundRecordEveryWeek.size(); j++) {
+            /*for (int j = 0; j < roundRecordEveryWeek.size(); j++) {
                 int attendNum = CatalogueUtil.appearNumber(roundRecordEveryWeek.get(j).split(","), Content.attend);
                 if (attendNum == 0) {
                     //每3天无1次主治医师查房记录
                     status.set("-1");
                     resultInfos.add(lastWardDateRangeList.get(j));
                 }
-            }
+            }*/
             if (resultInfos.size() > 0) {
                 info.set(StringUtils.join(resultInfos.toArray(), "；"));
             }