xielianghe

whepi-ui/templates/home/home.ftl

@@ -58,14 +58,14 @@
         var uptownId = $("#uptownId").val();
         if (uptownId == '1238790987234'){
             $('#ribao_trip')[0].style.display = 'none';
-            $('#ribao_dnjgl')[0].style.display = 'none';
-            $('#ribao_qz')[0].style.display = 'none';
-            $('#ribao_zz')[0].style.display = '';
-        }else{
-            $('#ribao_trip')[0].style.display = '';
             $('#ribao_dnjgl')[0].style.display = '';
             $('#ribao_qz')[0].style.display = '';
             $('#ribao_zz')[0].style.display = 'none';
+        }else{
+            $('#ribao_trip')[0].style.display = '';
+            $('#ribao_dnjgl')[0].style.display = 'none';
+            $('#ribao_qz')[0].style.display = 'none';
+            $('#ribao_zz')[0].style.display = '';
         }
         ribao_init();
         qiuzhu_init();

whepi-ui/templates/home/ribao.js

@@ -591,10 +591,12 @@ function splice(obj) {
 function ribaoInitialization(reportId) {
   if (reportId == null)
     return;
+  var userId = $("#userId").val();
   $.ajax({
     url: '/home/home/queryRibaoRefresh',
     data: {
-      reportId: reportId
+      reportId: reportId,
+      userCreate: userId
     },
     type: 'GET',
     success: function (data) {
@@ -722,151 +724,206 @@ function ribao_add() {
       $('#notOpenRibao')[0].style.display = '';
       $('#ribao')[0].style.display = 'none';
     }
-
-    var userId = $("#userId").val();
-    //获取用户家人
-    $.ajax({
-      url: '/home/selectAddSuspected',
-      get: "get",
-      data: {
-        "userCreate": userId
-      },
-      success: function (data) {
-        if (data != null || data != '') {
-          //存在
-          var suspected = data;
-          $("#js_input_user_sex").val(getGreder(suspected.grender));
-          $("#js_input_user_sex").attr("data-values", suspected.grender);
-          $("#js_input_user_name").val(suspected.userName);
-          $("#js_input_user_age").val(suspected.age);
-          //基本情况
-          if (suspected.familyStatus != "") {
-            var familyStatusList = suspected.familyStatus.split(",");
-            if (familyStatusList[0] == 1)
-              $("input[name='checkbox1']").prop("checked", "checked");
-            else
-              $("input[name='checkbox1']").removeAttr("checked");
-            if (familyStatusList[1] == 1)
-              $("input[name='checkbox2']").prop("checked", "checked");
-            else
-              $("input[name='checkbox2']").removeAttr("checked");
-            if (familyStatusList[2] == 1)
-              $("input[name='checkbox3']").prop("checked", "checked");
-            else
-              $("input[name='checkbox3']").removeAttr("checked");
-            if (familyStatusList[3] == 1)
-              $("input[name='checkbox4']").prop("checked", "checked");
-            else
-              $("input[name='checkbox4']").removeAttr("checked");
-            if (familyStatusList[4] == 1)
-              $("input[name='checkbox5']").prop("checked", "checked");
-            else
-              $("input[name='checkbox5']").removeAttr("checked");
-            if (familyStatusList[5] == 1)
-              $("input[name='checkbox6']").prop("checked", "checked");
-            else
-              $("input[name='checkbox6']").removeAttr("checked");
-            if (familyStatusList[6] == 1)
-              $("input[name='checkbox7']").prop("checked", "checked");
-            else
-              $("input[name='checkbox7']").removeAttr("checked");
-
-          }
-
-          $("#switchQuezhen").val(getMedical(suspected.medical));
-          $("#switchQuezhen").attr("data-values", suspected.medical);
-
-          $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
-          $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
-
-          $("#js_input_user_tiwen").val(suspected.temperature);
-
-          $("#js_input_user_kesou").val(getCough(suspected.cough));
-          $("#js_input_user_kesou").attr("data-values", suspected.cough);
-
-          $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
-          $("#js_input_user_jirou").attr("data-values", suspected.muscle);
-
-          $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
-          $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
-
-          $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
-          $("#js_input_user_fali").attr("data-values", suspected.fatigue);
-
-          $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
-          $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
-
-          $("#shuruqita").val(suspected.others);
-          $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult, suspected.temperatureScore));
-          $("#js_input_score_rezult_value").val(suspected.scoreRezult);
-          $("#js_input_temperature_score").val(suspected.temperatureScore);
-          $("#js_input_score_histroy").val(suspected.scoreHistroy);
-          $("#js_input_score").val(suspected.score);
-
-          $("#js_input_sf").val(getIsTrip(0));
-          $("#js_input_sf").attr("data-values", 0);
-          $('#none')[0].style.display = 'none';
-        }
-        else {
-          //基本情况
-          $("input[name='checkbox1']").removeAttr("checked");
-          $("input[name='checkbox2']").removeAttr("checked");
-          $("input[name='checkbox3']").removeAttr("checked");
-          $("input[name='checkbox4']").removeAttr("checked");
-          $("input[name='checkbox5']").removeAttr("checked");
-          $("input[name='checkbox6']").removeAttr("checked");
-          $("input[name='checkbox7']").removeAttr("checked");
-
-          $("#switchQuezhen").val(getMedical(0));
-          $("#switchQuezhen").attr("data-values", 0);
-
-          $("#switchDanjiangeli").val(getSingleRoom(0));
-          $("#switchDanjiangeli").attr("data-values", 0);
-
-          $("#js_input_user_tiwen").val(0);
-
-          $("#js_input_user_kesou").val(getCough(0));
-          $("#js_input_user_kesou").attr("data-values", 0);
-
-          $("#js_input_user_jirou").val(getMuscle(0));
-          $("#js_input_user_jirou").attr("data-values", 0);
-
-          $("#js_input_user_huxi").val(getDyspnea(0));
-          $("#js_input_user_huxi").attr("data-values", 0);
-
-          $("#js_input_user_fali").val(getFatigue(0));
-          $("#js_input_user_fali").attr("data-values", 0);
-
-          $("#js_input_user_fuxie").val(getDiarrhea(0));
-          $("#js_input_user_fuxie").attr("data-values", 0);
-
-
-          // $("#js_input_cxfs").empty();
-          // $("#js_input_cfd").empty();
-          // $("#js_input_mdd").empty();
-          // $('#js_input_cxfsq').val("");
-          // $('#js_input_cfdq').val("");
-          // $('#js_input_mddq').val("");
-          // listcx.splice(0,listcx.length);
-          // $('#tabtr').empty();
-          // $("#js_input_qtdd").val("");
-          // $("#js_input_jrszq").val("");
-          // $("#js_input_sf").val("");
-          $("#js_input_sf").val(getIsTrip(0));
-          $("#js_input_sf").attr("data-values", 0);
-          $('#none')[0].style.display = 'none';
-          $('#tabtr').empty();
-          // $("#suspectedId").val("");
-          // $("#js_input_gzzd").val("");
-          // $("#js_input_jrszd").val("");
-          // $('#js_input_mddq').attr("disabled","disabled");
-          // $('#js_input_jrszq').attr("disabled","disabled");
-          // $('#js_input_qtdd').attr("disabled","disabled");
-          // $('#js_input_cfdq').attr("disabled","disabled");
-
-        }
-      },
-    });
+    //基本情况
+    $("input[name='checkbox1']").removeAttr("checked");
+    $("input[name='checkbox2']").removeAttr("checked");
+    $("input[name='checkbox3']").removeAttr("checked");
+    $("input[name='checkbox4']").removeAttr("checked");
+    $("input[name='checkbox5']").removeAttr("checked");
+    $("input[name='checkbox6']").removeAttr("checked");
+    $("input[name='checkbox7']").removeAttr("checked");
+
+    $("#switchQuezhen").val(getMedical(0));
+    $("#switchQuezhen").attr("data-values", 0);
+
+    $("#switchDanjiangeli").val(getSingleRoom(0));
+    $("#switchDanjiangeli").attr("data-values", 0);
+
+    $("#js_input_user_tiwen").val(0);
+
+    $("#js_input_user_kesou").val(getCough(0));
+    $("#js_input_user_kesou").attr("data-values", 0);
+
+    $("#js_input_user_jirou").val(getMuscle(0));
+    $("#js_input_user_jirou").attr("data-values", 0);
+
+    $("#js_input_user_huxi").val(getDyspnea(0));
+    $("#js_input_user_huxi").attr("data-values", 0);
+
+    $("#js_input_user_fali").val(getFatigue(0));
+    $("#js_input_user_fali").attr("data-values", 0);
+
+    $("#js_input_user_fuxie").val(getDiarrhea(0));
+    $("#js_input_user_fuxie").attr("data-values", 0);
+
+
+    // $("#js_input_cxfs").empty();
+    // $("#js_input_cfd").empty();
+    // $("#js_input_mdd").empty();
+    // $('#js_input_cxfsq').val("");
+    // $('#js_input_cfdq').val("");
+    // $('#js_input_mddq').val("");
+    // listcx.splice(0,listcx.length);
+    // $('#tabtr').empty();
+    // $("#js_input_qtdd").val("");
+    // $("#js_input_jrszq").val("");
+    // $("#js_input_sf").val("");
+    $("#js_input_sf").val(getIsTrip(0));
+    $("#js_input_sf").attr("data-values", 0);
+    $('#none')[0].style.display = 'none';
+    $('#tabtr').empty();
+    // $("#suspectedId").val("");
+    // $("#js_input_gzzd").val("");
+    // $("#js_input_jrszd").val("");
+    // $('#js_input_mddq').attr("disabled","disabled");
+    // $('#js_input_jrszq').attr("disabled","disabled");
+    // $('#js_input_qtdd').attr("disabled","disabled");
+    // $('#js_input_cfdq').attr("disabled","disabled");
+
+    // var userId = $("#userId").val();
+    // //获取用户家人
+    // $.ajax({
+    //   url: '/home/selectAddSuspected',
+    //   get: "get",
+    //   data: {
+    //     "userCreate": userId
+    //   },
+    //   success: function (data) {
+    //     if (data != null || data != '') {
+    //       //存在
+    //       var suspected = data;
+    //       $("#js_input_user_sex").val(getGreder(suspected.grender));
+    //       $("#js_input_user_sex").attr("data-values", suspected.grender);
+    //       $("#js_input_user_name").val(suspected.userName);
+    //       $("#js_input_user_age").val(suspected.age);
+    //       //基本情况
+    //       if (suspected.familyStatus != "") {
+    //         var familyStatusList = suspected.familyStatus.split(",");
+    //         if (familyStatusList[0] == 1)
+    //           $("input[name='checkbox1']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox1']").removeAttr("checked");
+    //         if (familyStatusList[1] == 1)
+    //           $("input[name='checkbox2']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox2']").removeAttr("checked");
+    //         if (familyStatusList[2] == 1)
+    //           $("input[name='checkbox3']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox3']").removeAttr("checked");
+    //         if (familyStatusList[3] == 1)
+    //           $("input[name='checkbox4']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox4']").removeAttr("checked");
+    //         if (familyStatusList[4] == 1)
+    //           $("input[name='checkbox5']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox5']").removeAttr("checked");
+    //         if (familyStatusList[5] == 1)
+    //           $("input[name='checkbox6']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox6']").removeAttr("checked");
+    //         if (familyStatusList[6] == 1)
+    //           $("input[name='checkbox7']").prop("checked", "checked");
+    //         else
+    //           $("input[name='checkbox7']").removeAttr("checked");
+    //
+    //       }
+    //
+    //       $("#switchQuezhen").val(getMedical(suspected.medical));
+    //       $("#switchQuezhen").attr("data-values", suspected.medical);
+    //
+    //       $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
+    //       $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
+    //
+    //       $("#js_input_user_tiwen").val(suspected.temperature);
+    //
+    //       $("#js_input_user_kesou").val(getCough(suspected.cough));
+    //       $("#js_input_user_kesou").attr("data-values", suspected.cough);
+    //
+    //       $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
+    //       $("#js_input_user_jirou").attr("data-values", suspected.muscle);
+    //
+    //       $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
+    //       $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
+    //
+    //       $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
+    //       $("#js_input_user_fali").attr("data-values", suspected.fatigue);
+    //
+    //       $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
+    //       $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
+    //
+    //       $("#shuruqita").val(suspected.others);
+    //       $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult, suspected.temperatureScore));
+    //       $("#js_input_score_rezult_value").val(suspected.scoreRezult);
+    //       $("#js_input_temperature_score").val(suspected.temperatureScore);
+    //       $("#js_input_score_histroy").val(suspected.scoreHistroy);
+    //       $("#js_input_score").val(suspected.score);
+    //
+    //       $("#js_input_sf").val(getIsTrip(0));
+    //       $("#js_input_sf").attr("data-values", 0);
+    //       $('#none')[0].style.display = 'none';
+    //     }
+    //     else {
+    //       //基本情况
+    //       $("input[name='checkbox1']").removeAttr("checked");
+    //       $("input[name='checkbox2']").removeAttr("checked");
+    //       $("input[name='checkbox3']").removeAttr("checked");
+    //       $("input[name='checkbox4']").removeAttr("checked");
+    //       $("input[name='checkbox5']").removeAttr("checked");
+    //       $("input[name='checkbox6']").removeAttr("checked");
+    //       $("input[name='checkbox7']").removeAttr("checked");
+    //
+    //       $("#switchQuezhen").val(getMedical(0));
+    //       $("#switchQuezhen").attr("data-values", 0);
+    //
+    //       $("#switchDanjiangeli").val(getSingleRoom(0));
+    //       $("#switchDanjiangeli").attr("data-values", 0);
+    //
+    //       $("#js_input_user_tiwen").val(0);
+    //
+    //       $("#js_input_user_kesou").val(getCough(0));
+    //       $("#js_input_user_kesou").attr("data-values", 0);
+    //
+    //       $("#js_input_user_jirou").val(getMuscle(0));
+    //       $("#js_input_user_jirou").attr("data-values", 0);
+    //
+    //       $("#js_input_user_huxi").val(getDyspnea(0));
+    //       $("#js_input_user_huxi").attr("data-values", 0);
+    //
+    //       $("#js_input_user_fali").val(getFatigue(0));
+    //       $("#js_input_user_fali").attr("data-values", 0);
+    //
+    //       $("#js_input_user_fuxie").val(getDiarrhea(0));
+    //       $("#js_input_user_fuxie").attr("data-values", 0);
+    //
+    //
+    //       // $("#js_input_cxfs").empty();
+    //       // $("#js_input_cfd").empty();
+    //       // $("#js_input_mdd").empty();
+    //       // $('#js_input_cxfsq').val("");
+    //       // $('#js_input_cfdq').val("");
+    //       // $('#js_input_mddq').val("");
+    //       // listcx.splice(0,listcx.length);
+    //       // $('#tabtr').empty();
+    //       // $("#js_input_qtdd").val("");
+    //       // $("#js_input_jrszq").val("");
+    //       // $("#js_input_sf").val("");
+    //       $("#js_input_sf").val(getIsTrip(0));
+    //       $("#js_input_sf").attr("data-values", 0);
+    //       $('#none')[0].style.display = 'none';
+    //       $('#tabtr').empty();
+    //       // $("#suspectedId").val("");
+    //       // $("#js_input_gzzd").val("");
+    //       // $("#js_input_jrszd").val("");
+    //       // $('#js_input_mddq').attr("disabled","disabled");
+    //       // $('#js_input_jrszq').attr("disabled","disabled");
+    //       // $('#js_input_qtdd').attr("disabled","disabled");
+    //       // $('#js_input_cfdq').attr("disabled","disabled");
+    //
+    //     }
+    //   },
+    // });
 
   });
 }

whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -40,6 +40,15 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
             " ORDER by a.time_create  LIMIT 1")
     MsSuspected selectAddSuspected(@Param("userCreate") Long userCreate);
 
+    //获取最近的一个人一个家人
+    @Select("select a.*,c.* \n" +
+            "from ms_suspected a \n" +
+            "INNER JOIN ms_report b on a.report_id=b.report_id \n" +
+            "left JOIN ms_trip c on a.suspected_id=c.trip_id \n" +
+            "where b.user_create=#{userCreate} and b.report_date=(select report_date from ms_report where user_create=#{userCreate} and report_date<curdate() ORDER BY report_date desc LIMIT 1)\n" +
+            "ORDER by a.time_create ")
+    List<MsSuspected> selectNextSuspected(@Param("userCreate") Long userCreate);
+
     //选择家人
     @Select("select a.*,b.* from ms_suspected a LEFT JOIN ms_trip b on a.suspected_id=b.trip_id where a.suspected_id =#{suspectedId}")
     MsSuspected selectBySuspectedId(@Param("suspectedId") Long suspectedId);

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

@@ -36,13 +36,14 @@ public class MsSuspectedService {
     @Autowired
     private MsReportMapper msReportMapper;
     @Autowired
-    private MsTripMapper msTripMapper;
+    private MsReportService msReportService;
 
     //查询家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public MsSuspected selectSuspected(long suspectedId) {
         return msSuspectedMapper.selectBySuspectedId(suspectedId);
     }
+
     //查询家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public List<MsTripDet> selectTripSuspected(long suspectedId) {
@@ -55,6 +56,35 @@ public class MsSuspectedService {
         return msSuspectedMapper.selectAddSuspected(userCreate);
     }
 
+    //查询用户最近一天的一个人的家人
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public List<MsSuspected> selectNextSuspected(Long userCreate) {
+        List<MsSuspected> listSuspected = null;
+        listSuspected = msSuspectedMapper.selectNextSuspected(userCreate);
+        if (listSuspected != null && listSuspected.size() > 0) {
+            String tripDet;
+            for (MsSuspected msSuspected : listSuspected) {
+                tripDet = "";
+                //出行详细
+                List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(msSuspected.getSuspectedId());
+                if (listDet != null && listDet.size() > 0) {
+                    for (MsTripDet msTripDet : listDet) {
+                        tripDet += "出发地：" + msReportService.getLocalOther(msTripDet.getStartLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "目的地：" + msReportService.getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "出行方式：" + msReportService.getTripType(msTripDet.getTripType()) + ",";
+                        tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
+                    }
+                    msSuspected.setTripDet(tripDet.substring(0, tripDet.length() - 1));
+                    //去掉温度，主键
+                    msSuspected.setSuspectedId(0L);
+                    msSuspected.setTemperature(new BigDecimal(0));
+                }
+            }
+
+        }
+        return listSuspected;
+    }
+
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
@@ -268,7 +298,7 @@ public class MsSuspectedService {
         MsSuspected msSuspected = new MsSuspected();
         msSuspected.setTemperatureScore(getTemperatureScore(temperature));
         msSuspected.setScore(addScore(medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea));
-        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId)==null ?0:msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
+        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId) == null ? 0 : msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
         msSuspected.setScoreHistroy(scoreHistroy);
         msSuspected.setScoreRezult(scoreRezulte(medical, msSuspected.getScoreHistroy(), msSuspected.getScore()));
         return msSuspected;
@@ -297,7 +327,9 @@ public class MsSuspectedService {
     public Integer addScore(Integer medical, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea) {
         Integer score = 0;
 
-        if (medical == 0) {
+        if (medical == 1)
+            score = 5;
+        else {
             //温度
             score += getTemperatureScore(temperature);
             //咳嗽
@@ -310,8 +342,8 @@ public class MsSuspectedService {
             score += fatigue;
             //肌肉
             score += diarrhea;
-        } else
-            score = 5;
+        }
+
         return score;
     }
 
@@ -319,7 +351,8 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer scoreRezulte(Integer medical, Integer scoreHistory, Integer score) {
         Integer scoreRezult = 0;
-        if (medical == 0) {
+        if (medical == 1) scoreRezult = 4;
+        else {
             //判断用户是否含有历史评分
             if (scoreHistory == null) {
                 //判断结果
@@ -346,8 +379,7 @@ public class MsSuspectedService {
                         scoreRezult = 4;
                 }
             }
-        } else
-            scoreRezult = 4;
+        }
         return scoreRezult;
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -105,19 +105,33 @@ public class MsReportController {
             return null;
     }
 
-    //根据登录人获取家人
+    //根据点击获取家人
     @GetMapping("/home/home/queryRibao")
     public Model<List<MsSuspected>> queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
+        //今日有记录
+        List<MsSuspected> list = msReportService.getByReportReportDate(reportDate, userCreate);
+        if (list != null && list.size() > 0)
+            return Model.newSuccess(list);
+            //获取用户最新的记录
+        else {
+            return Model.newSuccess(msSuspectedService.selectNextSuspected(userCreate));
+        }
     }
 
     //根据日报获取家人
     @GetMapping("/home/home/queryRibaoRefresh")
-    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId) {
-        return Model.newSuccess(msReportService.getByReportId(reportId));
+    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId, @Pd(name = "userCreate") Long userCreate) {
+        //今日有记录
+        List<MsSuspected> list = msReportService.getByReportId(reportId);
+        if (list != null && list.size() > 0)
+            return Model.newSuccess(list);
+            //获取用户最新的记录
+        else {
+            return Model.newSuccess(msSuspectedService.selectNextSuspected(userCreate));
+        }
     }
 
     //全家报平安