护理报告优化

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java

@@ -27,8 +27,29 @@ public class WxNursingLogController extends BaseController {
     @Autowired
     private IWxNursingLogService wxNursingLogService;
 
+
+    /**
+     * 根据护理记录Id查询护理记录
+     */
+    @GetMapping(value = "/{id}")
+    public R getInfo(@PathVariable("id") Long id) {
+        return R.ok(wxNursingLogService.selectWxNursingLogById(id));
+    }
+
+    /**
+     * 新增用户护理日志
+     */
+    @PostMapping("/add")
+    public R add(@Validated @RequestBody WxNursingLogReq wxNursingLogReq) {
+        // 防止前端传输数据进来
+        wxNursingLogReq.setCompletionPercentage(null);
+        return R.ok(wxNursingLogService.insertWxNursingLog(wxNursingLogReq));
+    }
+
+    /* ----------  WL200 -------------------*/
+
     /**
-     * 查询用户护理记录
+     * 查询用户护理记录（WL200）
      *
      * @param instrumentId 当在护理报告中，查询某个仪器的列表使用
      * @param queryDate    当在护理报告中，查询某个历史之前的仪器的列表使用
@@ -42,26 +63,18 @@ public class WxNursingLogController extends BaseController {
     }
 
     /**
-     * FR200 水分测试报告历史记录
+     * 查询用户护理记录的当月统计信息（WL200）
      */
-    @GetMapping("/record/fr200/moistureTest")
+    @GetMapping("/statistics")
-    public TableDataInfo fr200MoistureTestRecord(@RequestParam(value = "instrumentId") Long instrumentId,
+    public R statistics(@RequestParam(value = "instrumentId") Long instrumentId) {
-                                @RequestParam(value = "queryDate") Date queryDate) {
+        return R.ok(wxNursingLogService.statistics(instrumentId));
-        startPage();
-        List<WxNursingLog> list = wxNursingLogService.fr200MoistureTestRecord(instrumentId, queryDate);
-        return getDataTable(list);
     }
 
-    /**
+
-     * 根据护理记录Id查询护理记录
+    /* ----------  FR200 -------------------*/
-     */
-    @GetMapping(value = "/{id}")
-    public R getInfo(@PathVariable("id") Long id) {
-        return R.ok(wxNursingLogService.selectWxNursingLogById(id));
-    }
 
     /**
-     * 查询用户护理记录的当月统计信息
+     * FR200 查询用户护理记录的当月统计信息
      */
     @GetMapping("/fr200/statistics")
     public R fr200Statistics(@RequestParam("nursingId") Long nursingId) {
@@ -69,21 +82,15 @@ public class WxNursingLogController extends BaseController {
     }
 
     /**
-     * 查询用户护理记录的当月统计信息（WL200仪器）
+     * FR200 水分测试报告历史记录
      */
-    @GetMapping("/statistics")
+    @GetMapping("/record/fr200/moistureTest")
-    public R statistics(@RequestParam(value = "instrumentId") Long instrumentId) {
+    public TableDataInfo fr200MoistureTestRecord(@RequestParam(value = "instrumentId") Long instrumentId,
-        return R.ok(wxNursingLogService.statistics(instrumentId));
+                                                 @RequestParam(value = "queryDate") Date queryDate) {
+        startPage();
+        List<WxNursingLog> list = wxNursingLogService.fr200MoistureTestRecord(instrumentId, queryDate);
+        return getDataTable(list);
     }
 
 
-    /**
-     * 新增用户护理日志
-     */
-    @PostMapping("/add")
-    public R add(@Validated @RequestBody WxNursingLogReq wxNursingLogReq) {
-        // 防止前端传输数据进来
-        wxNursingLogReq.setCompletionPercentage(null);
-        return R.ok(wxNursingLogService.insertWxNursingLog(wxNursingLogReq));
-    }
 }