Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/mock/menu.json

@@ -58,21 +58,23 @@
       "iconCls": "icon-blank fa fa-align-justify",
       "state": "close",
       "children": []
-    },
-    {
-      "id": "ENT10011",
-      "text": "授权测试",
-      "href": "/app/whepi/ceshi.js",
-      "iconCls": "icon-blank fa fa-align-justify",
-      "state": "close",
-      "children": []
-    }, {
-      "id": "ENT10012",
-      "text": "廖丹测试",
-      "href": "/app/whepi/lingyun/liaodan.js",
-      "iconCls": "icon-blank fa fa-align-justify",
-      "state": "close",
-      "children": []
     }
+//  ,
+//    {
+//      "id": "ENT10011",
+//      "text": "授权测试",
+//      "href": "/app/whepi/ceshi.js",
+//      "iconCls": "icon-blank fa fa-align-justify",
+//      "state": "close",
+//      "children": []
+//    }
+//  , {
+//      "id": "ENT10012",
+//      "text": "廖丹测试",
+//      "href": "/app/whepi/lingyun/liaodan.js",
+//      "iconCls": "icon-blank fa fa-align-justify",
+//      "state": "close",
+//      "children": []
+//    }
   ]
 }

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

@@ -35,6 +35,8 @@ public class MsTripService {
     @Autowired
     private MsSuspectedService msSuspectedService;
     @Autowired
+    private MsReportService msReportService;
+    @Autowired
     private UptownUnitMapper uptownUnitMapper;
 
 
@@ -175,7 +177,7 @@ public class MsTripService {
                     }
                 }
             }
-            //更新今日日报
+            //更新今日日报,直接上报
             msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
 
         } else {
@@ -262,7 +264,8 @@ public class MsTripService {
                 }
             }
             //更新今日日报,直接上报
-            msSuspectedService.updateReportStatus(reportId, medical, singleRoom, temperature);
+            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
+            msReportService.addReport(userCreate);
         }
         return reportId;
     }