Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/founder/ypbg/service/impl/YpbgServiceImpl.java

@@ -306,7 +306,7 @@ public class YpbgServiceImpl implements IYpbgService {
 		}
 		fas0Zb = NumberUtil.getPercent(fas0, qxs);
 
-		String fadw = "";
+		String fadw = "发生命案较多的有：";
 		if (faList!=null&&faList.size()>10){
 			for (int i =0;i<10;i++){
 				fadw += getMapValue(faList.get(i),"dwmc")+"、";
@@ -316,9 +316,14 @@ public class YpbgServiceImpl implements IYpbgService {
 				fadw += getMapValue(map, "dwmc")+"、";
 			}
 		}
-		fadw = fadw.substring(0,fadw.length()-1)+"。";
+		if (fadw.endsWith("、")){
+			fadw = fadw.substring(0,fadw.length()-1)+"。";
+		}else {
+			fadw = "";
+		}
+
 		String resultStr = "全国"+qxs+"个区县中，零发案的有"+fas0+"个、占"+fas0Zb+"，发生1起命案的"+fas1+"个，发生2起命案的"+fas2+"个，发生3起及以上命案的"+
-			fas3+"个。发生命案较多的有："+fadw;
+			fas3+"个。"+fadw;
 
 		return resultStr;
 	}