From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 11 十二月 2024 22:16:23 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 79c9d1a..8609d79 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -44,7 +44,7 @@
* 鏌ヨ鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PatArchive patArchive) {
startPage();
@@ -56,8 +56,8 @@
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
- @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.EXPORT)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatArchive patArchive) {
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -69,9 +69,9 @@
* 鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
@GetMapping(value = "/getInfo/{patid}")
- @ApiImplicitParam(name = "patid" , value = "鎮ｈ�卛d")
+ @ApiImplicitParam(name = "patid", value = "鎮ｈ�卛d")
public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
return success(patArchiveService.selectPatArchiveByPatid(patid));
}
@@ -80,7 +80,7 @@
// * 鏂板鎮ｈ�呮。妗�
// */
// @ApiOperation("鏂板鎮ｈ�呮。妗�")
-// @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+// //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// public AjaxResult add(@RequestBody PatArchive patArchive) {
@@ -91,8 +91,8 @@
* 鏂板鎮ｈ�呮。妗�
*/
@ApiOperation("淇敼鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
- @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody PatArchive patArchive) {
return toAjax(patArchiveService.update(patArchive));
@@ -102,8 +102,8 @@
* 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
*/
@ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
- @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdatePatInfo")
public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
@@ -113,10 +113,10 @@
* 鍒犻櫎鎮ｈ�呮。妗�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
- @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.DELETE)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{patids}")
- @ApiImplicitParam(name = "patids" , value = "鎮ｈ�卛d闆嗗悎" , dataType = "long" , dataTypeClass = Long.class)
+ @ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
public AjaxResult remove(@PathVariable Long[] patids) {
return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
}
@@ -129,7 +129,7 @@
*/
@ApiOperation("瀵煎叆鎮ｈ�呮枃浠跺鐞�")
@PostMapping("/importFilehandle")
- @ApiImplicitParams({@ApiImplicitParam(name = "tags" , value = "鏍囩"), @ApiImplicitParam(name = "multipartFile" , value = "涓婁紶鏂囦欢")})
+ @ApiImplicitParams({@ApiImplicitParam(name = "tags", value = "鏍囩"), @ApiImplicitParam(name = "multipartFile", value = "涓婁紶鏂囦欢")})
public AjaxResult importFilehandle(@RequestParam("tags") String tags, @RequestParam("multipartFile") MultipartFile multipartFile) {
Executor executor = Executors.newFixedThreadPool(3);
//鑾峰彇褰撳墠鐧婚檰浜�
@@ -172,6 +172,12 @@
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ if (CollectionUtils.isEmpty(patArchive.getLeavehospitaldistrictcodes()) || patArchive.getLeavehospitaldistrictcodes().size() == 0) {
+ patArchive.setLeavehospitaldistrictcodes(null);
+ }
+ if (CollectionUtils.isEmpty(patArchive.getLeaveldeptcodes()) || patArchive.getLeaveldeptcodes().size() == 0) {
+ patArchive.setLeaveldeptcodes(null);
+ }
List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
long count = PageUtils.count(new ISelect() {
@Override
@@ -207,7 +213,13 @@
@PostMapping("/getPatientInfo")
public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
- List<ServiceSubtask> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
+ if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
+ patArchiveReq.setLeavehospitaldistrictcodes(null);
+ }
+ if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
+ patArchiveReq.setLeaveldeptcodes(null);
+ }
+ List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
long count = PageUtils.count(new ISelect() {
@Override
public void doSelect() {
--
Gitblit v1.9.3