现场交接班记录、转科记录、24h内入院死亡记录问题处理

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

@@ -184,15 +184,18 @@ public class ConsultationTran extends TargetTran {
             //区别
             if(firSplit.length>0){
                 String deptStr = "";
-                for (int i = 0; i < 10; i++) {
+                for (int i = 0; i < firSplit.length; i++) {
                     String firStr = firSplit[i];
+                    if(firStr.contains("日期")){
+                         firStr = firStr.split("日期")[0];
+                    }
                     if(firStr.contains("请求")){
                          deptStr = firStr.substring(firStr.indexOf("请求")+"请求".length());
                     }
                     if(deptStr.contains(" ")){
                         String[] split = deptStr.split(" ");
-                        if(split.length>=2){
-                            deptStr = split[split.length-2];
+                        if(split.length>=2 && StringUtil.isNotEmpty(deptStr)){
+                            deptStr =deptStr.trim();
                         }
                     }
 
@@ -247,7 +250,7 @@ public class ConsultationTran extends TargetTran {
                 if(StringUtil.isEmpty(retMap.get("会诊目的")) || StringUtil.isEmpty(retMap.get("会诊理由")) && StringUtil.isNotEmpty(retMap.get("会诊理由及目的"))) {
                     String firStr = retMap.get("会诊理由及目的");
                     String specialName = retMap.get("会诊申请科室");
-                    if(firStr.contains(specialName)){
+                    if(StringUtil.isNotEmpty(firStr) && StringUtil.isNotEmpty(specialName) &&  firStr.contains(specialName)){
                          firStr = firStr.substring(0, firStr.lastIndexOf(specialName));
                         retMap.put("会诊目的",firStr);
                         retMap.put("会诊理由",firStr);

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

@@ -61,7 +61,7 @@ public class DutyShiftSystemTran extends TargetTran {
 
     public void dutyShiftSystemContrast ( List<DutyShiftSystemDoc> dutyShiftSystemDocs,Map<String, String> retMap) {
         String text = dutyShiftSystemDocs.get(0).getText();
-        String fir = text.split("\n")[1];
+        String fir = text;
         if(StringUtil.isNotEmpty(retMap.get("诊疗计划"))){
             String subStr = text.substring(text.indexOf("诊疗计划：")+"诊疗计划：".length());
             String planRet = retMap.get("诊疗计划");

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

@@ -137,17 +137,19 @@ public class LeaveHospitalTran extends TargetTran {
 
             }
 
-            if (StringUtil.isNotEmpty(retMap.get("首席医师").trim())) {
+            if (StringUtil.isNotEmpty(retMap.get("首席医师")) &&StringUtil.isNotEmpty(retMap.get("首席医师").trim())) {
                 String firDoctor = retMap.get("首席医师");
                 if(firDoctor.contains("经治/主治医师")){
-                    if(StringUtil.isNotEmpty( firDoctor.split("经治/主治医师")[0].trim())){
-                        firDoctor = firDoctor.split("经治/主治医师")[0].trim();
+                    String ote = firDoctor.split("经治/主治医师")[0];
+                    if(StringUtil.isNotEmpty(ote) && StringUtil.isNotEmpty(ote.trim())){
+                        firDoctor = ote.trim();
                         retMap.put("首席医师",firDoctor);
                     }else{
                         retMap.remove("首席医师");
                     }
-                    if(StringUtil.isNotEmpty( firDoctor.split("经治/主治医师")[1].trim())){
-                        String value = firDoctor.split("经治/主治医师")[1].trim();
+                    String otc = firDoctor.split("经治/主治医师")[1];
+                    if(StringUtil.isNotEmpty(otc) && StringUtil.isNotEmpty(otc.trim())){
+                        String value =otc.trim();
                         if(value.contains("：")){
                             value =  value.substring(value.indexOf("：")+1);
                         }

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

@@ -65,7 +65,12 @@ public class TransferRecordTran extends TargetTran {
     public void transferRecordContrast (TransferRecordDoc transferRecordDocs,Map<String, String> retMap) {
         //转入日期时间取第一时间
         String text = transferRecordDocs.getText();
-        String fir = text.split("\n")[1];
+        String fileName = "转入记录";
+        if(text.contains("转科记录")){
+            fileName = "转科记录";
+        }
+        String[] split = text.split(fileName);
+        String fir = split[0]+fileName;
         String planText = "";
         if(text.contains("转入诊疗计划：")){
             planText = text.substring( text.indexOf("转入诊疗计划："));