From 2cee324b6ccad0a6ed7d29761027c37bb5238748 Mon Sep 17 00:00:00 2001 From: WorldOneTwo <2197248717> Date: Sat, 23 Apr 2022 14:23:12 +0800 Subject: [PATCH] =?UTF-8?q?master=E7=AC=AC=E4=BA=8C=E5=8D=81=E4=BA=94?= =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4-=E5=AE=8C=E6=88=90=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E4=BC=A0=E9=80=92=E4=B8=8D=E5=90=8C=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=9A=84=E5=93=8D=E5=BA=94=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/bean/DailyReport.java | 9 ++++- .../controller/DailyReportController.java | 18 ++++++++++ .../example/controller/WorkerController.java | 33 +++++++++++++++++++ .../com/example/mapper/DailyReportMapper.xml | 7 ++-- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/bean/DailyReport.java b/src/main/java/com/example/bean/DailyReport.java index e86dc28..e95676c 100644 --- a/src/main/java/com/example/bean/DailyReport.java +++ b/src/main/java/com/example/bean/DailyReport.java @@ -19,7 +19,14 @@ public class DailyReport { public boolean errorCheck()//检查报告是否异常 { - error = 0; + if(highpressure > 140 || highpressure < 90 || + lowpressure > 90 || lowpressure < 60 || + heartRate > 100 || heartRate < 60 || + temperature > 37.3 || + covidTest == true) + error = 1; + else + error = 0; return false;//false表示没有错，true表示有错 } diff --git a/src/main/java/com/example/controller/DailyReportController.java b/src/main/java/com/example/controller/DailyReportController.java index 5908f19..7b7d692 100644 --- a/src/main/java/com/example/controller/DailyReportController.java +++ b/src/main/java/com/example/controller/DailyReportController.java @@ -2,12 +2,15 @@ package com.example.controller; import com.example.bean.DailyReport; import com.example.bean.RespBean; +import com.example.bean.User; import com.example.service.DailyReportService; +import com.example.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; @RestController @@ -15,6 +18,8 @@ import java.util.List; public class DailyReportController { @Autowired private DailyReportService dailyReportService; + @Autowired + private UserService userService; @PostMapping("/add") public RespBean addDailyReport(DailyReport dailyReport) @@ -51,4 +56,17 @@ public class DailyReportController { { return dailyReportService.selectByUserid(userid); } + + @PostMapping("/print") + public RespBean print(String userid) + { + User userByUserId = userService.getUserByUserId(userid); + List dailyReports = dailyReportService.selectByUserid(userid); + DailyReport dailyReport = dailyReports.get(0); + List objectList = new ArrayList<>(); + objectList.add(userByUserId); + objectList.add(dailyReport); + return new RespBean(objectList); + } + } diff --git a/src/main/java/com/example/controller/WorkerController.java b/src/main/java/com/example/controller/WorkerController.java index 7c25f41..1a2a95c 100644 --- a/src/main/java/com/example/controller/WorkerController.java +++ b/src/main/java/com/example/controller/WorkerController.java @@ -10,6 +10,7 @@ import com.example.service.WorkerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; @RestController @@ -90,4 +91,36 @@ public class WorkerController { { return workerService.getAllDoctors(); } + + @PostMapping("/selectUserAndDoctor") + public RespBean selectUserAndDoctor(String userid) + { + User userByUserId = userService.getUserByUserId(userid); + Doctor doctorById = doctorService.getDoctorById(userByUserId.getDid()); + List objectList = new ArrayList<>(); + objectList.add(userByUserId); + objectList.add(doctorById); + return new RespBean(objectList); + } + + @GetMapping("/selectNoReport") + public RespBean selectNoReport() + { + List users = userService.selectNoReport(); + return new RespBean(users); + } + + @GetMapping("/selectTodayError") + public RespBean selectTodayError() + { + List users = userService.selectTodayError(); + return new RespBean(users); + } + + @GetMapping("selectAll") + public RespBean selectAll() + { + List users = userService.selectAll(); + return new RespBean(users); + } } diff --git a/src/main/resources/com/example/mapper/DailyReportMapper.xml b/src/main/resources/com/example/mapper/DailyReportMapper.xml index 098a085..a7fc24b 100644 --- a/src/main/resources/com/example/mapper/DailyReportMapper.xml +++ b/src/main/resources/com/example/mapper/DailyReportMapper.xml @@ -7,8 +7,8 @@ insert into dailyreport - (uid, age, height, temperature, lowpressure, highpressure, error, heartRate, date, weight,covidtest) - values (#{uid},#{age},#{height},#{temperature},#{lowpressure},#{highpressure},#{error},#{heartRate},#{date},#{weight},#{covidTest}); + (uid, age, height, temperature, lowpressure, highpressure, error, heartRate, weight,covidtest) + values (#{uid},#{age},#{height},#{temperature},#{lowpressure},#{highpressure},#{error},#{heartRate},#{weight},#{covidTest}); update dailyreport @@ -18,12 +18,11 @@ highpressure = #{highpressure}, error = #{error}, heartRate = #{heartRate}, - date = #{date}, weight = #{weight}, covidtest = #{covidTest} where dailyreportid = #{dailyreportid} \ No newline at end of file -- GitLab