diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java index d19160a..f5c4788 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -103,6 +102,7 @@ public class AppController extends BaseController */ @ApiOperation("医院列表") @GetMapping("/hospital/list") + @Log(title = "查询医院列表", businessType = BusinessType.OTHER) public AjaxResult hospitalList() { List tHospitals = tHospitalService.selectTHospitalList(new THospital()); @@ -118,6 +118,7 @@ public class AppController extends BaseController */ @ApiOperation("医生信息获取") @GetMapping("/doctor/info") + @Log(title = "获取医生信息", businessType = BusinessType.OTHER) public AjaxResult doctorInformation(Long doctorId) { return AjaxResult.success(tDoctorService.selectAppDoctorDetailById(doctorId)); @@ -296,6 +297,7 @@ public class AppController extends BaseController @ApiOperation("获取患者详细信息") @GetMapping("/patient/info/{id}") + @Log(title = "获取患者详细信息", businessType = BusinessType.OTHER) public AjaxResult getPatientInfo2(@PathVariable("id") Long id) { @@ -311,12 +313,16 @@ public class AppController extends BaseController */ @ApiOperation("患者诊断记录历史列表") @GetMapping("/record/list/{patientId}") + @Log(title = "患者诊断记录历史列表", businessType = BusinessType.OTHER) public AjaxResult diagnosisOfRecordList(@PathVariable("patientId") Long patientId) { TPatientHospitalDoctor tPatientHospitalDoctor = new TPatientHospitalDoctor(); tPatientHospitalDoctor.setPatientId(patientId); List tRecords = tRecordService.queryRecordListByPHDids(tPatientHospitalDoctor); List tRecordResps = tRecords.stream().filter(record -> "1".equals(record.getStatus())).collect(Collectors.toList()); + if (tRecordResps.isEmpty()) { + return AjaxResult.success(new ArrayList()); + } List respList = tRecordResps.stream().sorted(Comparator.comparing(TRecordResp::getUploadTime).reversed()).collect(Collectors.toList()); return AjaxResult.success(respList); } @@ -329,6 +335,7 @@ public class AppController extends BaseController */ @ApiOperation("患者诊断记录信息详情") @GetMapping("/record/info/{id}") + @Log(title = "患者诊断记录信息详情", businessType = BusinessType.OTHER) public AjaxResult patientsWithDiagnosisOfRecordInformationDetails(@PathVariable("id") Long id) { Map data = new HashMap<>(); @@ -348,6 +355,7 @@ public class AppController extends BaseController */ @ApiOperation("患者已诊列表") @GetMapping("/record/diagnosedList") + @Log(title = "患者已诊列表", businessType = BusinessType.OTHER) public TableDataInfo patientsDiagnosedList(TRecordResultReq recordResultReq) { // recordResultReq.setStatus("1"); @@ -357,6 +365,7 @@ public class AppController extends BaseController @ApiOperation("首页患者列表") @GetMapping("/home/patient/list") + @Log(title = "查询首页患者列表", businessType = BusinessType.OTHER) public TableDataInfo queryHomePatientsList(TRecordResultReq recordResultReq) { // recordResultReq.setStatus("1"); @@ -373,6 +382,7 @@ public class AppController extends BaseController */ @ApiOperation("患者候诊列表") @GetMapping("/record/waitingList") + @Log(title = "查询患者候诊列表", businessType = BusinessType.OTHER) public TableDataInfo patientsWaitingList(TRecordResultReq recordResultReq) { // recordResultReq.setStatus("0"); @@ -382,6 +392,7 @@ public class AppController extends BaseController @ApiOperation("小程序获取患者详细信息") @GetMapping("/patient/info") + @Log(title = "小程序获取患者详细信息", businessType = BusinessType.OTHER) public AjaxResult getPatientInfo() { return AjaxResult.success(tPatientService.selectTPatientById(getUserId())); @@ -389,6 +400,7 @@ public class AppController extends BaseController @GetMapping("/patient/record/historyData") @ApiOperation("查询患者历史数据图表") + @Log(title = "查询患者历史数据图表", businessType = BusinessType.OTHER) public AjaxResult getHistoryRecordList(AppRecordReq appRecordReq) { TRecord tRecord = new TRecord(); @@ -398,6 +410,7 @@ public class AppController extends BaseController @PostMapping("/ai/{recordId}") @ApiOperation("ai接口") + @Log(title = "调用ai接口", businessType = BusinessType.OTHER) public AjaxResult aiPost(@PathVariable("recordId") Long recordId, @RequestBody AiPostReq aiPostReq) { //删除同一次预约调用多次ai接口的图片数据 @@ -451,6 +464,7 @@ public class AppController extends BaseController @GetMapping("/image/{recordId}") @ApiOperation("获取图片接口") + @Log(title = "获取图片接口", businessType = BusinessType.OTHER) public AjaxResult getAiImage(@PathVariable("recordId") Long recordId){ if(recordId == null){ return AjaxResult.error("未获取到参数"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/MpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/MpController.java index 8c6ddbe..60eec97 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/MpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/MpController.java @@ -31,6 +31,7 @@ public class MpController extends BaseController { @ApiOperation("患者诊断记录") @GetMapping("/patient/history/record") + @Log(title = "获取患者诊断记录", businessType = BusinessType.OTHER) public AjaxResult queryPatientHistoryRecord() { TRecord tRecord = new TRecord(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/PlatformController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/PlatformController.java index 42861c2..8256c62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/PlatformController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/PlatformController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.pc; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.resp.PlatformDayPlanResp; import com.ruoyi.system.domain.resp.WeekMonthPersonCountResp; import com.ruoyi.system.service.impl.PlatformService; @@ -29,6 +31,7 @@ public class PlatformController { @ApiOperation("工作台-设备统计") @PostMapping("/equCount") + @Log(title = "工作台-设备统计", businessType = BusinessType.OTHER) public AjaxResult equCount( @ApiParam(name = "hospitalId",value = "医院id",required = false) @RequestParam(required = false) Long hospitalId, @ApiParam(name = "doctorId",value = "医生id",required = false) @RequestParam(required = false) Long doctorId){ @@ -38,6 +41,7 @@ public class PlatformController { @ApiOperation("工作台-今日就诊计划") @PostMapping("/dayPlan") + @Log(title = "工作台-今日就诊计划", businessType = BusinessType.OTHER) public AjaxResult dayPlan( @ApiParam(name = "hospitalId",value = "医院id",required = false) @RequestParam(required = false) Long hospitalId, @ApiParam(name = "doctorId",value = "医生id",required = false) @RequestParam(required = false) Long doctorId){ @@ -47,6 +51,7 @@ public class PlatformController { @ApiOperation("工作台-就诊人数统计") @PostMapping("/weekMonthPersonCount") + @Log(title = "工作台-就诊人数统计", businessType = BusinessType.OTHER) public AjaxResult weekMonthPersonCount( @ApiParam(name = "hospitalId",value = "医院id",required = false) @RequestParam(required = false) Long hospitalId, @ApiParam(name = "doctorId",value = "医生id",required = false) @RequestParam(required = false) Long doctorId, @@ -57,6 +62,7 @@ public class PlatformController { @ApiOperation("工作台-患者年龄统计") @PostMapping("/ageCount") + @Log(title = "工作台-患者年龄统计", businessType = BusinessType.OTHER) public AjaxResult ageCount( @ApiParam(name = "hospitalId",value = "医院id",required = false) @RequestParam(required = false) Long hospitalId, @ApiParam(name = "doctorId",value = "医生id",required = false) @RequestParam(required = false) Long doctorId){ @@ -66,6 +72,7 @@ public class PlatformController { @ApiOperation("工作台-就诊时段统计") @PostMapping("/weekMonthTimeCount") + @Log(title = "工作台-就诊时段统计", businessType = BusinessType.OTHER) public AjaxResult weekMonthTimeCount( @ApiParam(name = "hospitalId",value = "医院id",required = false) @RequestParam(required = false) Long hospitalId, @ApiParam(name = "doctorId",value = "医生id",required = false) @RequestParam(required = false) Long doctorId, diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java index 5092b3c..70e5718 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TDoctorController.java @@ -47,6 +47,7 @@ public class TDoctorController extends BaseController */ @ApiOperation("查询医生信息列表") @PostMapping("/queryByPage") + @Log(title = "PC查询医生信息列表", businessType = BusinessType.OTHER) public TableDataInfo queryByPage(@RequestBody @Validated PcTDoctorQueryByPageReq pcTDoctorQueryByPageReq) { startPage(); @@ -58,7 +59,7 @@ public class TDoctorController extends BaseController * 导出医生信息列表 */ @ApiOperation("导出医生信息列表") - @Log(title = "医生信息", businessType = BusinessType.EXPORT) + @Log(title = "导出医生信息列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody @Validated PcTDoctorQueryByPageReq pcTDoctorQueryByPageReq) { @@ -74,6 +75,7 @@ public class TDoctorController extends BaseController */ @ApiOperation("获取医生信息详细信息") @GetMapping(value = "/queryById/{id}") + @Log(title = "PC获取医生信息详细信息", businessType = BusinessType.OTHER) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tDoctorService.selectTDoctorById(id)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/THospitalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/THospitalController.java index 5276504..b1f611f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/THospitalController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/THospitalController.java @@ -43,6 +43,7 @@ public class THospitalController extends BaseController */ @ApiOperation("查询医院信息列表") @PostMapping("/list") + @Log(title = "查询医院信息列表", businessType = BusinessType.OTHER) public TableDataInfo list(@RequestBody THospital tHospital) { startPage(); @@ -67,6 +68,7 @@ public class THospitalController extends BaseController */ @ApiOperation("获取医院信息详细信息") @GetMapping(value = "/{id}") + @Log(title = "获取医院信息详细信息", businessType = BusinessType.OTHER) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tHospitalService.selectTHospitalById(id)); @@ -110,6 +112,7 @@ public class THospitalController extends BaseController */ @ApiOperation("获取医院管理员下拉接口") @GetMapping(value = "/getHosptialAdminList") + @Log(title = "获取医院管理员下拉接口", businessType = BusinessType.OTHER) public AjaxResult getHosptialAdminList() { return AjaxResult.success(tHospitalService.getHosptialAdminList()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TImageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TImageController.java index 084755b..62cc17b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TImageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TImageController.java @@ -39,6 +39,7 @@ public class TImageController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:image:list')") @GetMapping("/list") + @Log(title = "查询图片列表", businessType = BusinessType.OTHER) public TableDataInfo list(TImage tImage) { startPage(); @@ -50,7 +51,7 @@ public class TImageController extends BaseController * 导出图片列表 */ @PreAuthorize("@ss.hasPermi('system:image:export')") - @Log(title = "图片", businessType = BusinessType.EXPORT) + @Log(title = "导出图片列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TImage tImage) { @@ -64,6 +65,7 @@ public class TImageController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:image:query')") @GetMapping(value = "/{id}") + @Log(title = "获取图片详细信息", businessType = BusinessType.OTHER) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tImageService.selectTImageById(id)); @@ -73,7 +75,7 @@ public class TImageController extends BaseController * 新增图片 */ @PreAuthorize("@ss.hasPermi('system:image:add')") - @Log(title = "图片", businessType = BusinessType.INSERT) + @Log(title = "新增图片", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TImage tImage) { @@ -84,7 +86,7 @@ public class TImageController extends BaseController * 修改图片 */ @PreAuthorize("@ss.hasPermi('system:image:edit')") - @Log(title = "图片", businessType = BusinessType.UPDATE) + @Log(title = "修改图片", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TImage tImage) { @@ -95,7 +97,7 @@ public class TImageController extends BaseController * 删除图片 */ @PreAuthorize("@ss.hasPermi('system:image:remove')") - @Log(title = "图片", businessType = BusinessType.DELETE) + @Log(title = "删除图片", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java index 9f38757..8be93cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientController.java @@ -47,6 +47,7 @@ public class TPatientController extends BaseController */ @ApiOperation("查询患者信息列表") @PostMapping("/queryByPage") + @Log(title = "查询患者信息列表", businessType = BusinessType.OTHER) public TableDataInfo queryByPage(@RequestBody @Validated PcTPatintQueryByPageReq pcTPatintQueryByPageReq) { startPage(); @@ -74,6 +75,7 @@ public class TPatientController extends BaseController */ @ApiOperation("获取患者信息详细信息") @GetMapping(value = "/queryById/{id}") + @Log(title = "获取患者信息详细信息", businessType = BusinessType.OTHER) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tPatientService.selectTPatientById(id)); @@ -83,7 +85,7 @@ public class TPatientController extends BaseController * 修改患者信息 */ @ApiOperation("修改患者信息") - @Log(title = "患者信息", businessType = BusinessType.UPDATE) + @Log(title = "修改患者信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TPatient tPatient) { @@ -94,7 +96,7 @@ public class TPatientController extends BaseController * 删除患者信息 */ @ApiOperation("删除患者信息") - @Log(title = "患者信息", businessType = BusinessType.DELETE) + @Log(title = "删除患者信息", businessType = BusinessType.DELETE) @DeleteMapping("/deleteById/{id}") public AjaxResult remove(@PathVariable("id") Long id) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientHospitalDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientHospitalDoctorController.java index db73519..da8b197 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientHospitalDoctorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TPatientHospitalDoctorController.java @@ -39,6 +39,7 @@ public class TPatientHospitalDoctorController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:doctor:list')") @GetMapping("/list") + @Log(title = "查询功能表列表", businessType = BusinessType.OTHER) public TableDataInfo list(TPatientHospitalDoctor tPatientHospitalDoctor) { startPage(); @@ -50,7 +51,7 @@ public class TPatientHospitalDoctorController extends BaseController * 导出【请填写功能名称】列表 */ @PreAuthorize("@ss.hasPermi('system:doctor:export')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @Log(title = "导出功能表列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TPatientHospitalDoctor tPatientHospitalDoctor) { @@ -64,6 +65,7 @@ public class TPatientHospitalDoctorController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:doctor:query')") @GetMapping(value = "/{id}") + @Log(title = "获取功能表详细信息", businessType = BusinessType.EXPORT) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tPatientHospitalDoctorService.selectTPatientHospitalDoctorById(id)); @@ -73,7 +75,7 @@ public class TPatientHospitalDoctorController extends BaseController * 新增【请填写功能名称】 */ @PreAuthorize("@ss.hasPermi('system:doctor:add')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @Log(title = "新增功能表", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TPatientHospitalDoctor tPatientHospitalDoctor) { @@ -84,7 +86,7 @@ public class TPatientHospitalDoctorController extends BaseController * 修改【请填写功能名称】 */ @PreAuthorize("@ss.hasPermi('system:doctor:edit')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @Log(title = "修改功能表", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TPatientHospitalDoctor tPatientHospitalDoctor) { @@ -95,7 +97,7 @@ public class TPatientHospitalDoctorController extends BaseController * 删除【请填写功能名称】 */ @PreAuthorize("@ss.hasPermi('system:doctor:remove')") - @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @Log(title = "删除功能表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java index c642852..ab6c234 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java @@ -49,6 +49,7 @@ public class TRecordController extends BaseController */ @ApiOperation("查询就诊记录列表") @GetMapping("/list") + @Log(title = "查询就诊记录列表", businessType = BusinessType.OTHER) public TableDataInfo list(TRecordResultReq tRecord) { startPage(); @@ -74,6 +75,7 @@ public class TRecordController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:record:query')") @GetMapping(value = "/{id}") + @Log(title = "获取诊断记录信息详细信息", businessType = BusinessType.OTHER) public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tRecordService.selectTRecordById(id)); @@ -83,7 +85,7 @@ public class TRecordController extends BaseController * 新增诊断记录信息 */ @PreAuthorize("@ss.hasPermi('system:record:add')") - @Log(title = "诊断记录信息", businessType = BusinessType.INSERT) + @Log(title = "新增诊断记录信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TRecord tRecord) { @@ -94,7 +96,7 @@ public class TRecordController extends BaseController * 修改诊断记录信息 */ @PreAuthorize("@ss.hasPermi('system:record:edit')") - @Log(title = "诊断记录信息", businessType = BusinessType.UPDATE) + @Log(title = "修改诊断记录信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TRecord tRecord) { @@ -105,7 +107,7 @@ public class TRecordController extends BaseController * 删除诊断记录信息 */ @PreAuthorize("@ss.hasPermi('system:record:remove')") - @Log(title = "诊断记录信息", businessType = BusinessType.DELETE) + @Log(title = "删除诊断记录信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { @@ -114,6 +116,7 @@ public class TRecordController extends BaseController @GetMapping("getInfo/{id}") @ApiOperation("查询患者诊断记录信息") + @Log(title = "查询患者诊断记录信息", businessType = BusinessType.OTHER) public AjaxResult getInfoById(@PathVariable("id") Long id){ if(id == null){ return AjaxResult.error("未获取到id"); @@ -130,6 +133,7 @@ public class TRecordController extends BaseController @GetMapping("/image/{recordId}") @ApiOperation("获取图片接口") + @Log(title = "获取图片接口", businessType = BusinessType.OTHER) public AjaxResult getAiImage(@PathVariable("recordId") Long recordId){ if(recordId == null){ return AjaxResult.error("未获取到参数"); @@ -142,6 +146,7 @@ public class TRecordController extends BaseController @GetMapping("getHistoryRecordList") @ApiOperation("查询患者历史数据图表") + @Log(title = "查询患者历史数据图表", businessType = BusinessType.OTHER) public AjaxResult getHistoryRecordList(TRecord tRecord){ return tRecordService.getHistoryList(tRecord); } @@ -154,6 +159,7 @@ public class TRecordController extends BaseController */ @ApiOperation("诊断记录上传") @PostMapping("diagnostic/upload") + @Log(title = "诊断记录上传", businessType = BusinessType.UPDATE) public AjaxResult diagnosticRecordsUploaded(@RequestBody AppRecordReq appRecordReq) { TRecord tRecord = new TRecord(); BeanUtils.copyProperties(appRecordReq, tRecord);