提交代码

yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java

@@ -105,7 +105,6 @@ public class PatientexamlistController {
 
     @PutMapping("/update")
     @Operation(summary = "更新PACS检查列表")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
     public CommonResult<Boolean> updatePatientexamlist(@Valid @RequestBody PatientexamlistSaveReqVO updateReqVO) {
         patientexamlistService.updatePatientexamlist(updateReqVO);
         return success(true);
@@ -113,7 +112,6 @@ public class PatientexamlistController {
 
     @PutMapping("/updateExamItemName")
     @Operation(summary = "更新ExamItemName")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
     public CommonResult<Boolean> updateExamItemNameById(@RequestParam("id") String id, @RequestParam("examItemName") String examItemName) {
         patientexamlistService.updateExamItemNameById(id, examItemName);
         return success(true);
@@ -122,7 +120,6 @@ public class PatientexamlistController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除PACS检查列表")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:delete')")
     public CommonResult<Boolean> deletePatientexamlist(@RequestParam("id") String id) {
         patientexamlistService.deletePatientexamlist(id);
         return success(true);
@@ -131,7 +128,6 @@ public class PatientexamlistController {
     @GetMapping("/get")
     @Operation(summary = "获得PACS检查列表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<PatientexamlistRespVO> getPatientexamlist(@RequestParam("id") String id) {
         PatientexamlistDO patientexamlist = patientexamlistService.getPatientexamlist(id);
         return success(BeanUtils.toBean(patientexamlist, PatientexamlistRespVO.class));
@@ -158,7 +154,6 @@ public class PatientexamlistController {
 
     @GetMapping("/page")
     @Operation(summary = "获得PACS检查列表分页")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<PageResult<PatientexamlistRespVO>> getPatientexamlistPage(@Valid PatientexamlistPageReqVO pageReqVO) {
 
 //        //获取当前登陆用户
@@ -245,7 +240,6 @@ public class PatientexamlistController {
 
     @GetMapping("/pageIllnessCase")
     @Operation(summary = "获得PACS病例管理分页")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<PageResult<PatientexamlistDO>> getIllnessCasePage(@Valid IllnessCasePageReqVO pageReqVO) {
         PageResult<PatientexamlistDO> pageResult = patientexamlistService.getIllnessCasePage(pageReqVO);
         return success(pageResult);
@@ -253,7 +247,6 @@ public class PatientexamlistController {
 
     @GetMapping("/pageReportPrintStatistics")
     @Operation(summary = "获得PACS报告打印统计分页")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<PageResult<PatientexamlistDO>> getReportPrintStatisticsPage(@Valid ReportPrintPageReqVO pageReqVO) {
         PageResult<PatientexamlistDO> pageResult = patientexamlistService.getReportPrintStatisticsPage(pageReqVO);
         return success(pageResult);
@@ -261,7 +254,6 @@ public class PatientexamlistController {
 
     @GetMapping("/positiveStatistics")
     @Operation(summary = "阳性统计")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<List<Map<String, Object>>> getPositiveStatistics(@Valid PositiveStatisticsReqVO reqVO) {
         List<Map<String, Object>> result = patientexamlistService.getPositiveStatistics(reqVO);
         return success(result);
@@ -269,7 +261,6 @@ public class PatientexamlistController {
 
     @GetMapping("/warningStatisticsReport")
     @Operation(summary = "危急报告统计")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<PageResult<PatientexamlistDO>> getWarningStatisticsReport(@Valid WarningStatisticsReportReqVO reqVO) {
         PageResult<PatientexamlistDO> pageResult = patientexamlistService.getWarningStatisticsReport(reqVO);
         return success(pageResult);
@@ -277,7 +268,6 @@ public class PatientexamlistController {
 
     @GetMapping("/dicomDataSync")
     @Operation(summary = "dicom数据同步")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<Map<String, Object>> dicomDataSync() {
         Map<String, Object> _out = new HashMap<>();
         List<String> ids = null;
@@ -314,7 +304,6 @@ public class PatientexamlistController {
 
     @GetMapping("/dicomDataRefresh")
     @Operation(summary = "dicomj检查后数据刷新")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     public CommonResult<Boolean> dicomDataRefresh() {
         //获取当前登陆用户
         AdminUserDO user = userService.getUser(getLoginUserId());
@@ -324,7 +313,6 @@ public class PatientexamlistController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出PACS检查列表 Excel")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportPatientexamlistExcel(@Valid PatientexamlistPageReqVO pageReqVO,
                                            HttpServletResponse response) throws IOException {
@@ -340,7 +328,6 @@ public class PatientexamlistController {
     @Operation(summary = "获取到org表的上级机构ID 更新到检查表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @Parameter(name = "orgId", description = "机构编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
     @LogRecord(type = "检查列表", subType = "申请", bizNo = "999999", success = "ID为{{#id}}的患者申请")
     public CommonResult<String> UPDATEHigOrg(@RequestParam("id") String id, @RequestParam("orgId") String orgId) {
 
@@ -365,7 +352,6 @@ public class PatientexamlistController {
 
     @PutMapping("/examineupdate")
     @Operation(summary = "超声保存更新数据")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
     @LogRecord(type = "超声保存", subType = "保存", bizNo = "1002", success = "保存ID为{{#updateReqVO.getId}}的患者")
     public CommonResult<Boolean> updateexaminelist(@Valid @RequestBody PatientexamlistSaveReqVO updateReqVO) {
 
@@ -378,7 +364,6 @@ public class PatientexamlistController {
 
     @GetMapping("/examine")
     @Operation(summary = "超声审核更新数据")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
     @LogRecord(type = "超声审核", subType = "审核", bizNo = "1002", success = "审核ID为{{#id}}的患者")
     public CommonResult<Boolean> examine(@RequestParam("id") String id,@RequestParam("doctorid") String doctorid,@RequestParam("doctorname") String doctorname) {
 

yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/positivestatistics/PositivestatisticsController.java

@@ -42,7 +42,6 @@ public class PositivestatisticsController {
 
     @PostMapping("/create")
     @Operation(summary = "创建阳性统计字典")
-    @PreAuthorize("@ss.hasPermission('tblist:positivestatistics:create')")
     public CommonResult<String> createPositivestatistics(@Valid @RequestBody PositivestatisticsSaveReqVO createReqVO) {
         createReqVO.setDiseaseName(createReqVO.getDiseaseName() == null ? "" : createReqVO.getDiseaseName().trim());
         createReqVO.setKeyWord(createReqVO.getKeyWord() == null ? "" : createReqVO.getKeyWord().trim());
@@ -58,7 +57,6 @@ public class PositivestatisticsController {
 
     @PutMapping("/update")
     @Operation(summary = "更新阳性统计字典")
-    @PreAuthorize("@ss.hasPermission('tblist:positivestatistics:update')")
     public CommonResult<String> updatePositivestatistics(@Valid @RequestBody PositivestatisticsSaveReqVO updateReqVO) {
         updateReqVO.setDiseaseName(updateReqVO.getDiseaseName() == null ? "" : updateReqVO.getDiseaseName().trim());
         updateReqVO.setKeyWord(updateReqVO.getKeyWord() == null ? "" : updateReqVO.getKeyWord().trim());
@@ -80,7 +78,6 @@ public class PositivestatisticsController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除阳性统计字典")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('tblist:positivestatistics:delete')")
     public CommonResult<Boolean> deletePositivestatistics(@RequestParam("id") String id) {
         positivestatisticsService.deletePositivestatistics(id);
         return success(true);
@@ -89,7 +86,6 @@ public class PositivestatisticsController {
     @GetMapping("/get")
     @Operation(summary = "获得阳性统计字典")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tblist:positivestatistics:query')")
     public CommonResult<PositivestatisticsDO> getPositivestatistics(@RequestParam("id") String id) {
         PositivestatisticsDO positivestatistics = positivestatisticsService.getPositivestatistics(id);
         return success(positivestatistics);
@@ -97,7 +93,6 @@ public class PositivestatisticsController {
 
     @GetMapping("/page")
     @Operation(summary = "获得阳性统计字典分页")
-    @PreAuthorize("@ss.hasPermission('tblist:positivestatistics:query')")
     public CommonResult<PageResult<PositivestatisticsDO>> getPositivestatisticsPage(@Valid PositivestatisticsPageReqVO pageReqVO) {
         PageResult<PositivestatisticsDO> pageResult = positivestatisticsService.getPositivestatisticsPage(pageReqVO);
         return success(pageResult);

yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java

@@ -96,7 +96,6 @@ public class ultrasonicController {
     @GetMapping("/reporttemplatetlist")
     @Operation(summary = "获取模版表数据")
     @DataPermission(enable = false)
-    @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
     public CommonResult<List<Tree>> getreporttemplatelist(@RequestParam("orgID") String orgID, @RequestParam("type") String type, @RequestParam("isprivate") String isprivate) throws Exception {
         //当前登陆用户
         AdminUserDO user = userService.getUser(getLoginUserId());
@@ -224,7 +223,6 @@ public class ultrasonicController {
     @GetMapping("/getpathologyimglist")
     @Operation(summary = "获取病理图片列表")
     @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
     public CommonResult<List<medicalimgDO>> getPathologyImgList(@RequestParam("orgID") String orgId, @RequestParam("regID") String regId, @RequestParam("select") String select) {
         List<medicalimgDO> devicelist = ultrasonicService.getPathologyImgList(orgId, regId, select);
         return success(BeanUtils.toBean(devicelist, medicalimgDO.class));
@@ -233,7 +231,6 @@ public class ultrasonicController {
     @GetMapping("/getimageslist")
     @Operation(summary = "获取图片列表")
     @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
     public CommonResult<List<medicalimgDO>> getimageslist(@RequestParam("orgID") String orgId, @RequestParam("regID") String regId, @RequestParam("select") String select) {
         List<medicalimgDO> devicelist = ultrasonicService.getmedicalimgist(orgId, regId, select);
         return success(BeanUtils.toBean(devicelist, medicalimgDO.class));
@@ -251,7 +248,6 @@ public class ultrasonicController {
 
     @PutMapping("/examineimageupdate")
     @Operation(summary = "超声审核更新图片数据")
-    @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
     public CommonResult<Boolean> updateexamineimagelist(@Valid @RequestBody List<upmedicalimgVO> updateReqVO) {
 
         if (!updateReqVO.isEmpty()) {
@@ -314,7 +310,6 @@ public class ultrasonicController {
     @GetMapping("/upreporttemplatetime")
     @Operation(summary = "更新模版表时间")
     @DataPermission(enable = false)
-    @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
     public CommonResult<Boolean> upreporttemplatetime(@RequestParam("pid") String pid) throws ParseException {
 
         //当前时间

yudao-server/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: yudao-server
 
   profiles:
-    active: local
+    active: 222ecg
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -174,6 +174,8 @@ yudao:
       - /admin-api/tblist/ecganalysisparas/insert
       - /admin-api/system/zhuoziSSO/login
       - /admin-api/system/zhuoziSSO/thirdInfoLogin
+      - /admin-api/tblist/ecganalysisparas/getIdCardEcgData
+      - /admin-api/tblist/patientexamlist/getplexamidinfo
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径
@@ -233,6 +235,8 @@ yudao:
       - /admin-api/tblist/ecganalysisparas/insert
       - /admin-api/system/zhuoziSSO/login
       - /admin-api/system/zhuoziSSO/thirdInfoLogin
+      - /admin-api/tblist/ecganalysisparas/getIdCardEcgData
+      - /admin-api/tblist/patientexamlist/getplexamidinfo
     ignore-tables:
       - system_tenant
       - system_tenant_package
@@ -297,13 +301,13 @@ yudao:
         key: pLXUGAwK5305
         customer: E77DF18BE109F454A5CD319E44BF5177
 
-debug: false
+debug: true
 
 # 积木报表配置
 jeecg:
   jmreport:
     saas-mode: tenant
-#土贵乌拉 需要的配置 项目名称：/admin
+#土贵乌拉 需要的配置 项目名称：/admin  adminbl  adminecg
-#server:
+server:
-#  servlet:
+  servlet:
-#    context-path: /admin
+    context-path: /adminecg