1.修改bug

2.修改首程、手术记录数据不对问题

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/BeHospitalizedAI.java

@@ -322,7 +322,7 @@ public class BeHospitalizedAI extends ModelAI {
      * @param inputInfo
      */
     public void putMensesCrfData(JSONObject jsonObject, InputInfo inputInfo) {
-        if (jsonObject == null) {
+        if (jsonObject == null || jsonObject.getJSONObject(entityRelationObject) == null) {
             return;
         }
         JSONObject aiOut = jsonObject.getJSONObject(entityRelationObject).getJSONObject(BeHospitalizedAI.outputs);

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunFirstCourseRecordHtmlAnalysis.java

@@ -33,7 +33,11 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
             if (StringUtil.isNotBlank(htmlContent)) {
                 String[] lines = htmlContent.split("\n\n");
                 if (lines.length > 1) {
-                    htmlContent = lines[1];
+                    String text = "";
+                    for (int i = 1; i < lines.length; i++) {
+                        text += lines[i];
+                    }
+                    //htmlContent = lines[1];
                     String date = CommonAnalysisUtil.extractDate(htmlContent);
                     if (StringUtil.isNotBlank(date)) {
                         structureMap.put("时间", date);

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationRecordHtmlAnalysis.java

@@ -44,12 +44,13 @@ public class BeiLunOperationRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
     }
 
     private void analysisGeneral(Element bigDivElement, Map<String, String> map) {
-        if (bigDivElement.selectFirst("hr") != null) {
+        /*if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
-        }
+        }*/
         String text = BeiLunHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         text = text.replaceAll("第1页", "");
         List<String> titles = Lists.newArrayList(
+                "姓名", "性别", "出生日期", "科别", "病区", "床号", "住院号",
                 "手术时间", "手术日期", "术前诊断", "手术指征", "手术人员", "麻醉方式", "麻醉人员", "接生者",
                 "术前胎心", "手术名称", "术后诊断", "手术者及助手名称", "术中取病理标本", "麻醉方法", "麻 醉 者", "手术经过",
                 "医生签名", "记录时间", "时间", "记录者", "术中输血", "术前宫颈准备日期", "药物名称及用法", "导管或其他", "插入深度",