From f79c5a2c2623ba9103aae792eac4b8cf9b7feeff Mon Sep 17 00:00:00 2001 From: chenqi Date: Wed, 17 Jun 2026 12:20:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(clinical-pathway):=20=E4=BF=AE=E5=A4=8DP0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20delete=5Fflag/=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6/=E7=BC=BA=E5=A4=B1=E7=AB=AF=E7=82=B9/tenant?= =?UTF-8?q?=5Fid=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClinicalPathwayController.java | 14 ++++++++++++++ .../migration/V58__clinical_pathway_variance.sql | 4 ++-- ...__fix_clinical_pathway_variance_delete_flag.sql | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V59__fix_clinical_pathway_variance_delete_flag.sql diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinical/controller/ClinicalPathwayController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinical/controller/ClinicalPathwayController.java index 67c8a19d0..4fa0ec277 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinical/controller/ClinicalPathwayController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinical/controller/ClinicalPathwayController.java @@ -18,6 +18,7 @@ public class ClinicalPathwayController { private final IClinicalPathwayService pathwayService; private final IClinicalPathwayExecutionService executionService; private final IClinicalPathwayAppService clinicalPathwayAppService; + @PreAuthorize("@ss.hasPermi('inpatient:clinical:list')") @GetMapping("/page") public R getPage(@RequestParam(value="diseaseCode",required=false) String diseaseCode, @RequestParam(value="pageNo",defaultValue="1") Integer pageNo, @@ -27,13 +28,16 @@ public class ClinicalPathwayController { .eq(ClinicalPathway::getStatus, "ACTIVE"); return R.ok(pathwayService.page(new Page<>(pageNo, pageSize), w)); } + @PreAuthorize("@ss.hasPermi('inpatient:clinical:edit')") @PostMapping("/add") @Transactional(rollbackFor=Exception.class) public R add(@RequestBody ClinicalPathway p) { p.setVersion(1); p.setStatus("ACTIVE"); p.setCreateTime(new Date()); pathwayService.save(p); return R.ok(p); } + @PreAuthorize("@ss.hasPermi('inpatient:clinical:edit')") @PostMapping("/enter") @Transactional(rollbackFor=Exception.class) public R enterPathway(@RequestBody ClinicalPathwayExecution e) { e.setStatus("IN_PATH"); e.setEnterDate(java.time.LocalDate.now()); e.setCreateTime(new Date()); executionService.save(e); return R.ok(e); } + @PreAuthorize("@ss.hasPermi('inpatient:clinical:edit')") @PutMapping("/complete/{id}") @Transactional(rollbackFor=Exception.class) public R completePathway(@PathVariable Long id) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); @@ -42,6 +46,7 @@ public class ClinicalPathwayController { e.setStatus("COMPLETED"); e.setCompleteDate(java.time.LocalDate.now()); executionService.updateById(e); return R.ok(); } + @PreAuthorize("@ss.hasPermi('inpatient:clinical:edit')") @PutMapping("/vary/{id}") @Transactional(rollbackFor=Exception.class) public R varyPathway(@PathVariable Long id, @RequestParam("reason") String reason) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); @@ -49,6 +54,7 @@ public class ClinicalPathwayController { ClinicalPathwayExecution e = executionService.getOne(qw); if (e == null) return R.fail("执行记录不存在"); e.setStatus("VARIATION"); e.setVariationReason(reason); executionService.updateById(e); return R.ok(); } + @PreAuthorize("@ss.hasPermi('inpatient:clinical:list')") @GetMapping("/stats") public R getStats() { Map stats = new HashMap<>(); @@ -106,4 +112,12 @@ public class ClinicalPathwayController { @RequestParam(required = false) String endDate) { return AjaxResult.success(clinicalPathwayAppService.getStatistics(startDate, endDate)); } + @Operation(summary = "执行记录分页") + @PreAuthorize("@ss.hasPermi('inpatient:clinical:list')") + @GetMapping("/execution/page") + public AjaxResult getExecutionPage(@RequestParam(required = false) Long pathwayId, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) { + return AjaxResult.success(clinicalPathwayAppService.getExecutionPage(pathwayId, pageNo, pageSize)); + } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V58__clinical_pathway_variance.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V58__clinical_pathway_variance.sql index 3c8ff9d16..4642004e2 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V58__clinical_pathway_variance.sql +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V58__clinical_pathway_variance.sql @@ -10,8 +10,8 @@ CREATE TABLE IF NOT EXISTS clinical_pathway_variance ( adjustment_action TEXT, record_by BIGINT, record_by_name VARCHAR(50), - tenant_id INTEGER DEFAULT 0, - del_flag CHAR(1) DEFAULT '0', + tenant_id BIGINT DEFAULT 0, + delete_flag CHAR(1) DEFAULT '0', create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, create_by VARCHAR(64), update_time TIMESTAMP, diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V59__fix_clinical_pathway_variance_delete_flag.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V59__fix_clinical_pathway_variance_delete_flag.sql new file mode 100644 index 000000000..52432ae42 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V59__fix_clinical_pathway_variance_delete_flag.sql @@ -0,0 +1,2 @@ +ALTER TABLE clinical_pathway_variance RENAME COLUMN del_flag TO delete_flag; +ALTER TABLE clinical_pathway_variance ALTER COLUMN tenant_id SET DATA TYPE BIGINT;