Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/lingyun/HCDialogDetail.js

@@ -55,8 +55,8 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
-            {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
-            {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
+            // {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
+            // {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
           ]],
         }
       },

whepi-ui/templates/home/ribao.js

@@ -819,7 +819,8 @@ function ribao_cell(v) {
 function ribao_add() {
   $('#btnAdd').on('click', function () {
 
-
+// 获取定位
+    getLocation();
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -1016,8 +1017,6 @@ function ribao_add() {
     //     }
     //   },
     // });
-    // 获取定位
-    getLocation();
 
   });
 }
@@ -1245,7 +1244,8 @@ function ribaoCommit() {
       isTrip = sf;
     }
 
-  } else {
+  } else
+    {
     workLocal = 0;
     workLocalOther = "";
     todyLocal = 0;
@@ -1399,6 +1399,9 @@ function updateSuspected(suspectedId) {
     success: function (data) {
       // console.log(data);
       if (data) {
+        // 获取定位
+        getLocation();
+
         var suspected = data;
         $("#suspectedId").val(suspected.suspectedId);
         $("#js_input_user_sex").val(getGreder(suspected.grender));
@@ -1568,9 +1571,6 @@ function updateSuspected(suspectedId) {
             tab();
           },
         });
-
-        // 获取定位
-        getLocation();
       }
     },
   });

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

@@ -147,7 +147,7 @@ public class MsTripService {
             msSuspectedMapper.insert(msSuspected);
 
             //添加出行
-            if (todayLocal > 0 && workLocal > 0) {
+            if (todayLocal >= 0 && workLocal >= 0) {
                 MsTrip msTrip = new MsTrip();
                 msTrip.setTripId(msSuspected.getSuspectedId());
                 msTrip.setIsTrip(isTrip);