Merge remote-tracking branch 'origin/debug' into debug

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName : THR0140
@@ -26,8 +27,8 @@ public class THR0140 extends QCCatalogue {
             return;
         }
         List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
-        allDoctorWradDocs.stream().filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师")));
-        if (allDoctorWradDocs.size() == 0) {
+        List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs.stream().filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师"))).collect(Collectors.toList());
+        if (recordDoctorList.size() == 0) {
             status.set("0");
         }
 

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessThreeLevelWard.java

@@ -187,17 +187,20 @@ public class EntityProcessThreeLevelWard extends EntityProcess {
                     start = Integer.parseInt(lemma.getPosition());
                     title = lemma.getProperty();//截取的这一段文本的标题
                 } else {
-                    //subContent = content.substring(start + title.length(), Integer.parseInt(lemma.getPosition()));
                     subContentIndex = start + lemma.getText().length() + 1 + "," + Integer.parseInt(lemma.getPosition());
                     putSubContent(titleText, title, subContentIndex);
                     start = Integer.parseInt(lemma.getPosition());
                     title = lemma.getProperty();//截取的这一段文本的标题
                 }
             } else {
-                //如果是最后一个Lemma，文本就从start开始取，取到结束
-                //subContent = content.substring((start + lemma.getText().length()));
+                //将倒数第二个标题存入结构
+                subContentIndex = start + lemma.getText().length() + 1 + "," + Integer.parseInt(lemma.getPosition());
+                putSubContent(titleText, title, subContentIndex);
+                //如果是最后一个Lemma，文本就从当前lemma的position开始取，取到结束
+                title = lemma.getProperty();//截取的这一段文本的标题
+                start = Integer.parseInt(lemma.getPosition());
                 int lastIndex = content.length() - 1;
-                subContentIndex = start + lemma.getText().length() + "," + lastIndex;
+                subContentIndex = start + "," + lastIndex;
                 putSubContent(titleText, title, subContentIndex);
             }
         }