Merge branch 'master' into master-手术随访

陈昶聿

18 小时以前 5dcd6447f315e821727508cd26bf05f8220b39c8

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java

@@ -109,7 +109,8 @@
                }
            }
        }
        Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum));
        Collections.sort(serviceSubtaskDetailSET,
                Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo)));
        map1.put("filteredDetails", serviceSubtaskDetailSET);

        map1.put("voice", "");