会诊记录

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

@@ -134,9 +134,25 @@ public class BeHospitalizedTran extends TargetTran {
             //24小时出入院现病史
             if(StringUtil.isEmpty(retMap.get("现病史")) && StringUtil.isNotEmpty(retMap.get("入院情况"))) {
                 String value = retMap.get("入院情况");
+                String placeName = "";
                 if(value.contains("查体：")){
                     value = value.substring(0, value.lastIndexOf("查体："));
                 }
+                if(value.contains("收住我科")){
+                    placeName = "收住我科";
+                }
+                if(value.contains("门诊收住")){
+                    placeName = "门诊收住";
+                }
+                if( value.contains("收入院")){
+                    placeName = "收入院";
+                }
+                if( value.contains("收治入院")){
+                    placeName = "收治入院";
+                }
+                if(StringUtil.isNotEmpty(placeName)){
+                    value = value.substring(0, value.lastIndexOf(placeName)+placeName.length());
+                }
                 if(StringUtil.isNotEmpty(value)){
                   retMap.put("现病史",value);
                     retMap.put("症状描述",value);

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

@@ -207,6 +207,12 @@ public class ConsultationTran extends TargetTran {
                                 retStr = firRet.substring(0, firRet.indexOf(")")+")".length());
                             }
                         }
+                        if( flag && firRet.contains("房")){
+                            retStr = firRet.substring(0, firRet.indexOf("房")+"房".length());
+                            if(firRet.contains(")")){
+                                retStr = firRet.substring(0, firRet.indexOf(")")+")".length());
+                            }
+                        }
 
                         if(StringUtil.isNotEmpty(retStr)) {
                             retMap.put("会诊申请科室",retStr);
@@ -244,8 +250,10 @@ public class ConsultationTran extends TargetTran {
             if(StringUtil.isNotEmpty("科室")){
                 retMap.remove("科室");
             }
-
-
+            if(StringUtil.isEmpty(retMap.get("会诊意见")) ||StringUtil.isEmpty(retMap.get("会诊结论")) ){
+                retMap.remove("会诊意见");
+                retMap.remove("会诊结论");
+            }
         }
     }