Merge remote-tracking branch 'origin/master'

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCQualitySql.java

@@ -41,7 +41,7 @@ public interface LCQualitySql {
     })
     SSRS LCQualitySql5(@Param("para0") String para0,@Param("para1") String para1);
 
-    @SQL(value = "select l.AutoUWFlag , GROUP_CONCAT(a.UWIdea SEPARATOR ';')  from lcguwtrace a right join lcguwmaster l on l.GrpContNo =a.GrpContNo  where 1=1 @{0} ;", clauses = {
+    @SQL(value = "select l.AutoUWFlag , string_agg(a.UWIdea , ';')  from lcguwtrace a LEFT JOIN lcguwmaster l on l.GrpContNo =a.GrpContNo  where 1=1 @{0}  GROUP BY l.AutoUWFlag;", clauses = {
             @Clause(key = 0, clause = " and l.GrpContNo = '#{para0}'", expression = "#{para0} != empty")
     })
     SSRS LCQualitySql6(@Param("para0") String para0);