直接死亡原因

structure-center/src/main/java/com/lantone/structure/facade/tran/DeathCaseDiscussionTran.java

@@ -234,14 +234,7 @@ public class DeathCaseDiscussionTran extends TargetTran {
             //直接死亡原因名称
             if(StringUtil.isNotEmpty(retMap.get("死亡诊断"))){
                 String deathDiagnosislName = retMap.get("死亡诊断");
-                String trueRet = "";
-                if(deathDiagnosislName.contains("2.")){
-                     trueRet = deathDiagnosislName.substring(0, deathDiagnosislName.indexOf("2."));
-                    if(trueRet.contains("1.")){
-                        trueRet = trueRet.substring(2);
-                    }
-                }
-                retMap.put("直接死亡原因名称",trueRet);
+                comatible(deathDiagnosislName,retMap);
             }
 
             //主持人签名
@@ -286,6 +279,27 @@ public class DeathCaseDiscussionTran extends TargetTran {
 
     }
 
+    public static void comatible(String deathDiagnosislName,Map<String,String>retMap){
+        String trueRet = "";
+        if (deathDiagnosislName.contains("2.")) {
+            trueRet = deathDiagnosislName.substring(0, deathDiagnosislName.indexOf("2."));
+            if (trueRet.contains("1.")) {
+                trueRet = trueRet.substring(2);
+            }
+        }else{
+            if (deathDiagnosislName.contains("1.")) {
+                trueRet = deathDiagnosislName;
+            }else{
+                trueRet=  deathDiagnosislName.trim().split(" ")[0];
+            }
+        }
+
+        if(StringUtil.isNotEmpty(trueRet)){
+            retMap.put("直接死亡原因名称", trueRet);
+        }
+    }
+
+
     /**
      * 抽取文本中的最后时间
      *

structure-center/src/main/java/com/lantone/structure/facade/tran/DeathRecordTran.java

@@ -180,7 +180,16 @@ public class DeathRecordTran extends TargetTran {
             if (trueRet.contains("1.")) {
                 trueRet = trueRet.substring(2);
             }
+        }else{
+            if (deathDiagnosislName.contains("1.")) {
+                trueRet = deathDiagnosislName;
+            }else{
+                trueRet=  deathDiagnosislName.trim().split(" ")[0];
+            }
+        }
+
+       if(StringUtil.isNotEmpty(trueRet)){
+            retMap.put("直接死亡原因名称", trueRet);
         }
-        retMap.put("直接死亡原因名称", trueRet);
     }
 }