Merge branch 'test_branch' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -461,7 +461,7 @@ public class MsReportService {
                     for (MsTripDet msTripDet : listTripDet) {
                         MsTripDet msTripDet1 = new MsTripDet();
                         msTripDet1.setTripDetId(IdWorker.getId());
-                        msTripDet1.setTripId(msSuspected.getSuspectedId());
+                        msTripDet1.setTripId(msSuspected1.getSuspectedId());
                         msTripDet1.setSort(msTripDet.getSort());
                         msTripDet1.setStartLocal(msTripDet.getStartLocal());
                         msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());