术后首次病程记录

structure-center/src/main/java/com/lantone/structure/facade/StructureFacade.java

@@ -59,9 +59,9 @@ public class StructureFacade {
             /*case "上级医师查房记录":
                 targetTran = new ThreeLevelWardTran();
                 break;*/
-          /*  case "入院记录":
+            case "入院记录":
                 targetTran = new BeHospitalizedTran();
-                break;*/
+                break;
             case "24h内入出院记录":
                 targetTran = new BeHospitalizedTran();
                 break;
@@ -95,10 +95,10 @@ public class StructureFacade {
             case "术前讨论":
                 targetTran = new PreoperativeDiscussionTran();
                 break;
-           /* case "术后首次病程记录":
+            case "术后首次病程记录":
                 targetTran = new OperationDiscussionTran();
                 break;
-            case "日常病程记录":
+           /* case "日常病程记录":
                 targetTran = new DailyCourseRecordTran();
                 break;*/
             default:

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

@@ -73,27 +73,51 @@ public class OperationDiscussionTran extends TargetTran {
         if(text.contains("修正诊断")){
             flagTitle = "修正诊断";
         }
+        if(text.contains("术后诊断")){
+            flagTitle = "术后诊断";
+        }
+        if(text.contains("术后诊断：")){
+            flagTitle = "术后诊断：";
+        }
         if(text.contains("目前诊断")){
             flagTitle = "目前诊断";
         }
+        if(text.contains("目前诊断考虑")){
+            flagTitle = "目前诊断考虑";
+        }
+        if(text.contains("诊断为")){
+            flagTitle = "诊断为";
+        }
+
         String flagTitleFir = "探查：";
         if(text.contains("分析病历特点：")){
             flagTitleFir = "分析病历特点：";
+        }if(text.contains("查房：")){
+            flagTitleFir = "查房：";
+        }if(text.contains("查房后指出")){
+            flagTitleFir = "查房后指出";
+        } if(text.contains("术中诊断")){
+            flagTitleFir = "术中诊断";
         }
         String flagTitleSec = "诊疗计划";
         String flagTitleThr = "注意事项";
+        //诊断依据
+        if(text.contains(flagTitleFir)){
+            String strSec = text.substring(text.indexOf(flagTitleFir) + flagTitleFir.length());
+            if(strSec.contains(flagTitleSec)){
+                strSec = strSec.substring(0,strSec.indexOf(flagTitleSec));
+            }
+            if(strSec.contains("术后诊断：")){
+                strSec = strSec.substring(0,strSec.indexOf("术后诊断："));
+            }
+            if(StringUtil.isNotEmpty(strSec)){
+                retMap.put("诊断依据",strSec);
+            }
+        }
+
         if(text.contains(flagTitle)){
             String sureStr = text.substring(text.indexOf(flagTitle) + flagTitle.length());
-            //诊断依据
-            if(sureStr.contains(flagTitleFir)){
-                String strSec = sureStr.substring(sureStr.indexOf(flagTitleFir) + flagTitleFir.length());
-                if(strSec.contains(flagTitleSec)){
-                    strSec = strSec.substring(0,strSec.indexOf(flagTitleSec));
-                }
-                if(StringUtil.isNotEmpty(strSec)){
-                    retMap.put("诊断依据",strSec);
-                }
-            }
+
             //注意事项
             if(sureStr.contains(flagTitleThr)){
                 String strSec = sureStr.substring(sureStr.indexOf(flagTitleThr) + flagTitleThr.length());
@@ -115,11 +139,20 @@ public class OperationDiscussionTran extends TargetTran {
             }
             if(sureStr.contains("明确")){
                 sureStr = sureStr.substring(0,sureStr.indexOf("明确"));
+            }if(sureStr.contains("“") && sureStr.contains("”")){
+                sureStr = sureStr.substring(sureStr.indexOf("“")+"“".length(),sureStr.indexOf("”"));
+            }
+            if (sureStr.contains("。")) {
+                sureStr = sureStr.split("。")[0];
             }
             retMap.put("术后诊断名称",sureStr);
         }
-        if(text.contains("注意观察") && StringUtil.isEmpty(retMap.get("注意事项"))){
-            String sureStr = text.substring(text.indexOf("注意观察"));
+        String notion = "注意";
+       if(text.contains("注意观察")){
+            notion = "注意观察";
+        }
+        if(text.contains(notion) && StringUtil.isEmpty(retMap.get("注意事项"))){
+            String sureStr = text.substring(text.indexOf(notion));
             if(sureStr.contains("评分：")){
                 sureStr = sureStr.substring(0,sureStr.indexOf("评分："));
             }
@@ -129,9 +162,12 @@ public class OperationDiscussionTran extends TargetTran {
             retMap.put("注意事项",sureStr);
         }
         String signName= parseString(text);
-        if(StringUtil.isNotEmpty(signName)&& !signName.contains(text)){
+        if(StringUtil.isNotEmpty(signName)&& !signName.contains(text) && signName.length()<=15){
             retMap.put("医师签名",signName);
         }
+        if(StringUtil.isEmpty(retMap.get("医师签名")) ||StringUtil.isEmpty(retMap.get("医师签名").trim())){
+            retMap.remove("医师签名");
+        }
 
     }