Merge branch 'master' into his/common

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -1523,7 +1523,7 @@ public class ConsoleByDeptFacade {
             if(operationInfo.contains(";")){
                 String[] split = operationInfo.split(";");
                 if(StringUtils.isEmpty(split[0])){
-                    operationInfo = split[1];
+                    operationInfo = operationInfo.substring(operationInfo.indexOf(split[1]));
                 }
             }
 
@@ -1572,7 +1572,7 @@ public class ConsoleByDeptFacade {
         if(courseRecord.contains(";")) {
             String[] courseRecordSplit = courseRecord.split(";");
             if (StringUtils.isEmpty(courseRecordSplit[0])) {
-                courseRecord = courseRecordSplit[1];
+                courseRecord = courseRecord.substring(courseRecord.indexOf(courseRecordSplit[1]));
             }
         }
         qualityControlDTO.setCourseRecord(StringUtils.isEmpty(courseRecord)==true?"无缺陷":courseRecord);
@@ -1663,7 +1663,7 @@ public class ConsoleByDeptFacade {
         if(otherCase.contains(";")) {
             String[] otherCaseSplit = otherCase.split(";");
             if(StringUtils.isEmpty(otherCaseSplit[0])){
-                otherCase = otherCaseSplit[1];
+                otherCase = otherCase.substring(otherCase.indexOf(otherCaseSplit[1]));
             }
         }
         qualityControlDTO.setOtherCase(StringUtils.isEmpty(otherCase)==true?"无缺陷":otherCase);

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -2468,7 +2468,7 @@ public class ConsoleFacade {
                 if(operationInfo.contains(";")){
                     String[] split = operationInfo.split(";");
                     if(StringUtils.isEmpty(split[0])){
-                        operationInfo = split[1];
+                        operationInfo = operationInfo.substring(operationInfo.indexOf(split[1]));
                     }
                 }
 
@@ -2517,7 +2517,7 @@ public class ConsoleFacade {
         if(courseRecord.contains(";")) {
             String[] courseRecordSplit = courseRecord.split(";");
             if (StringUtils.isEmpty(courseRecordSplit[0])) {
-                courseRecord = courseRecordSplit[1];
+                courseRecord = courseRecord.substring(courseRecord.indexOf(courseRecordSplit[1]));
             }
         }
         qualityControlDTO.setCourseRecord(StringUtils.isEmpty(courseRecord)==true?"无缺陷":courseRecord);
@@ -2608,7 +2608,7 @@ public class ConsoleFacade {
         if(otherCase.contains(";")) {
         String[] otherCaseSplit = otherCase.split(";");
         if(StringUtils.isEmpty(otherCaseSplit[0])){
-            otherCase = otherCaseSplit[1];
+            otherCase = otherCase.substring(otherCase.indexOf(otherCaseSplit[1]));
         }
         }
             qualityControlDTO.setOtherCase(StringUtils.isEmpty(otherCase)==true?"无缺陷":otherCase);