批量修改

yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/device/DeviceController.java

@@ -27,7 +27,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - tb_device")
 @RestController
-@RequestMapping("/test/device")
+@RequestMapping("/system/device")
 @Validated
 public class DeviceController {
 
@@ -36,14 +36,14 @@ public class DeviceController {
 
     @PostMapping("/create")
     @Operation(summary = "创建tb_device")
-    @PreAuthorize("@ss.hasPermission('test:device:create')")
+    @PreAuthorize("@ss.hasPermission('system:device:create')")
     public CommonResult<String> createDevice(@Valid @RequestBody DeviceSaveReqVO createReqVO) {
         return success(deviceService.createDevice(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新tb_device")
-    @PreAuthorize("@ss.hasPermission('test:device:update')")
+    @PreAuthorize("@ss.hasPermission('system:device:update')")
     public CommonResult<Boolean> updateDevice(@Valid @RequestBody DeviceSaveReqVO updateReqVO) {
         deviceService.updateDevice(updateReqVO);
         return success(true);
@@ -52,7 +52,7 @@ public class DeviceController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除tb_device")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('test:device:delete')")
+    @PreAuthorize("@ss.hasPermission('system:device:delete')")
     public CommonResult<Boolean> deleteDevice(@RequestParam("id") String id) {
         deviceService.deleteDevice(id);
         return success(true);
@@ -61,7 +61,7 @@ public class DeviceController {
     @GetMapping("/get")
     @Operation(summary = "获得tb_device")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('test:device:query')")
+    @PreAuthorize("@ss.hasPermission('system:device:query')")
     public CommonResult<DeviceDO> getDevice(@RequestParam("id") String id) {
         DeviceDO device = deviceService.getDevice(id);
         return success(device);
@@ -69,7 +69,7 @@ public class DeviceController {
 
     @GetMapping("/getlist")
     @Operation(summary = "获得tb_device")
-    @PreAuthorize("@ss.hasPermission('test:device:query')")
+    @PreAuthorize("@ss.hasPermission('system:device:query')")
     public CommonResult<List<DeviceDO>> getDevicelist() {
         List<DeviceDO> devices = deviceService.getDevicelist();
         return success(devices);
@@ -77,7 +77,7 @@ public class DeviceController {
 
     @GetMapping("/page")
     @Operation(summary = "获得tb_device分页")
-    @PreAuthorize("@ss.hasPermission('test:device:query')")
+    @PreAuthorize("@ss.hasPermission('system:device:query')")
     public CommonResult<PageResult<DeviceDO>> getDevicePage(@Valid DevicePageReqVO pageReqVO) {
         PageResult<DeviceDO> pageResult = deviceService.getDevicePage(pageReqVO);
         return success(pageResult);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/exampart/ExampartController.java

@@ -31,7 +31,7 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
 
 @Tag(name = "管理后台 - 检查部位")
 @RestController
-@RequestMapping("/test/exampart")
+@RequestMapping("/system/exampart")
 @Validated
 public class ExampartController {
 
@@ -42,14 +42,14 @@ public class ExampartController {
 
     @PostMapping("/create")
     @Operation(summary = "创建检查部位")
-    @PreAuthorize("@ss.hasPermission('test:exampart:create')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:create')")
     public CommonResult<String> createExampart(@Valid @RequestBody ExampartSaveReqVO createReqVO) {
         return success(exampartService.createExampart(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新检查部位")
-    @PreAuthorize("@ss.hasPermission('test:exampart:update')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:update')")
     public CommonResult<Boolean> updateExampart(@Valid @RequestBody ExampartSaveReqVO updateReqVO) {
         exampartService.updateExampart(updateReqVO);
         return success(true);
@@ -58,7 +58,7 @@ public class ExampartController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除检查部位")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('test:exampart:delete')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:delete')")
     public CommonResult<Boolean> deleteExampart(@RequestParam("id") String id) {
         exampartService.deleteExampart(id);
         return success(true);
@@ -67,7 +67,7 @@ public class ExampartController {
     @GetMapping("/get")
     @Operation(summary = "获得检查部位")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('test:exampart:query')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:query')")
     public CommonResult<ExampartDO> getExampart(@RequestParam("id") String id) {
         ExampartDO exampart = exampartService.getExampart(id);
         return success(exampart);
@@ -75,7 +75,7 @@ public class ExampartController {
 
     @GetMapping("/getlist")
     @Operation(summary = "获得检查部位")
-    @PreAuthorize("@ss.hasPermission('test:exampart:query')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:query')")
     public CommonResult<List<ExampartDO>> getExampartlist() {
         //获取当前登陆用户
         AdminUserDO user = userService.getUser(getLoginUserId());
@@ -92,7 +92,7 @@ public class ExampartController {
 
     @GetMapping("/page")
     @Operation(summary = "获得检查部位分页")
-    @PreAuthorize("@ss.hasPermission('test:exampart:query')")
+    @PreAuthorize("@ss.hasPermission('system:exampart:query')")
     public CommonResult<PageResult<ExampartDO>> getExampartPage(@Valid ExampartPageReqVO pageReqVO) {
         PageResult<ExampartDO> pageResult = exampartService.getExampartPage(pageReqVO);
         return success(pageResult);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java

@@ -83,7 +83,7 @@ public interface DicomworklistMapper extends BaseMapperX<DicomworklistDO> {
     @Select(" SELECT CONCAT(\n" +
             "(SELECT CAST(COUNT(*) AS CHAR) FROM dicomstudies t1\n" +
             " LEFT JOIN dicomseries t2 ON t1.StudyInsta=t2.StudyInsta\n" +
-            " WHERE t1.PatientID=#{patientID} AND t1.StudyInsta=#{studyInsta})\n" +
+            " WHERE t1.PatientID=#{patientID} AND t1.StudyInsta=#{studyInsta} and t2.BodyPartEx is not null )\n" +
             ",'/',\n" +
             "(SELECT CAST(COUNT(*) AS CHAR) FROM dicomstudies t1\n" +
             " LEFT JOIN dicomseries t2 ON t1.StudyInsta=t2.StudyInsta\n" +

yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java

@@ -35,7 +35,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
                 .likeIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus())
                 .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname())
                 .likeIfPresent(PatientexamlistDO::getGender, reqVO.getGender())
-                .orderByAsc(PatientexamlistDO::getRegId));
+                .orderByDesc(PatientexamlistDO::getExamDate));
     }
 
     //ReportPrintPageReqVO分页
@@ -50,7 +50,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
                 .eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType())
                 .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname())
                 .isNotNull(PatientexamlistDO::getDiagDate)
-                .orderByAsc(PatientexamlistDO::getRegId));
+                .orderByDesc(PatientexamlistDO::getExamDate));
     }
 
     //PatientexamlistPageReqVO分页

yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/reporttemplate/ReporttemplateController.java

@@ -28,7 +28,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 诊断模板")
 @RestController
-@RequestMapping("/test/reporttemplate")
+@RequestMapping("/system/reporttemplate")
 @Validated
 public class ReporttemplateController {
 
@@ -37,14 +37,14 @@ public class ReporttemplateController {
 
     @PostMapping("/create")
     @Operation(summary = "创建诊断模板")
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:create')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:create')")
     public CommonResult<String> createReporttemplate(@Valid @RequestBody ReporttemplateSaveReqVO createReqVO) {
         return success(reporttemplateService.createReporttemplate(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新诊断模板")
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:update')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:update')")
     public CommonResult<Boolean> updateReporttemplate(@Valid @RequestBody ReporttemplateSaveReqVO updateReqVO) {
         reporttemplateService.updateReporttemplate(updateReqVO);
         return success(true);
@@ -53,7 +53,7 @@ public class ReporttemplateController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除诊断模板")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:delete')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:delete')")
     public CommonResult<Boolean> deleteReporttemplate(@RequestParam("id") String id) {
         reporttemplateService.deleteReporttemplate(id);
         return success(true);
@@ -62,7 +62,7 @@ public class ReporttemplateController {
     @GetMapping("/get")
     @Operation(summary = "获得诊断模板")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:query')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:query')")
     public CommonResult<ReporttemplateDO> getReporttemplate(@RequestParam("id") String id) {
         ReporttemplateDO reporttemplate = reporttemplateService.getReporttemplate(id);
         return success(reporttemplate);
@@ -70,7 +70,7 @@ public class ReporttemplateController {
 
     @GetMapping("/getlist")
     @Operation(summary = "获得诊断模板list")
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:query')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:query')")
     public CommonResult<List<ReporttemplateDO>> getReporttemplateList() {
         List<ReporttemplateDO> reporttemplates = reporttemplateService.getReporttemplatelist();
         return success(reporttemplates);
@@ -78,7 +78,7 @@ public class ReporttemplateController {
 
     @GetMapping("/page")
     @Operation(summary = "获得诊断模板分页")
-    @PreAuthorize("@ss.hasPermission('test:reporttemplate:query')")
+    @PreAuthorize("@ss.hasPermission('system:reporttemplate:query')")
     public CommonResult<PageResult<ReporttemplateDO>> getReporttemplatePage(@Valid ReporttemplatePageReqVO pageReqVO) {
         PageResult<ReporttemplateDO> pageResult = reporttemplateService.getReporttemplatePage(pageReqVO);
         return success(pageResult);