From 1045706e5e9429f71dde959a5a3c5c349935eae3 Mon Sep 17 00:00:00 2001 From: chenqi Date: Sat, 20 Jun 2026 12:43:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(mobile):=20=E8=A1=A5=E5=85=A8=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3+?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DAPI=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- healthlink-his-mobile/src/api/index.js | 17 +++++---- .../appservice/INursingMobileAppService.java | 3 ++ .../impl/NursingMobileAppServiceImpl.java | 36 ++++++++++++++++++ .../controller/NursingMobileController.java | 28 ++++++++++++++ .../src/main/resources/application-dev.yml | 6 +-- healthlink-his-ui/src/router/index.js | 37 +++++++++++++++++++ 6 files changed, 116 insertions(+), 11 deletions(-) diff --git a/healthlink-his-mobile/src/api/index.js b/healthlink-his-mobile/src/api/index.js index 11f02c2ef..7c436271a 100644 --- a/healthlink-his-mobile/src/api/index.js +++ b/healthlink-his-mobile/src/api/index.js @@ -43,20 +43,21 @@ export const authApi = { } export const nursingApi = { - getTasks: (params) => service.get('/nurse-station/advice-process/page', { params }), - completeTask: (id, data) => service.post(`/nurse-station/advice-process/execute`, data), + getTasks: (params) => service.get('/nurse-station/advice-process/inpatient-advice', { params }), + completeTask: (id, data) => service.post(`/nurse-station/advice-process/advice-execute`, data), getPatientInfo: (id) => service.get('/inpatientmanage/inhospitalregister/' + id), getPatientList: (params) => service.get('/patient-home-manage/init', { params }), - getOrders: (encounterId) => service.get('/nurse-station/advice-process/page', { params: { encounterId } }), - getVitalSigns: (patientId) => service.get('/vital-signs-chart/encounter', { params: { patientId } }), + getOrders: (encounterId) => service.get('/nurse-station/advice-process/inpatient-advice', { params: { encounterId } }), + getVitalSigns: (patientId) => service.get('/vital-signs-chart/page', { params: { patientId } }), submitVitalSign: (data) => service.post('/nursing/mobile/vital-sign', data), getAssessments: (encounterId) => service.get('/api/v1/nursing/assessment/encounter/' + encounterId), submitAssessment: (data) => service.post('/api/v1/nursing/assessment', data), - getDrugDistribution: (params) => service.get('/drug-trace/page', { params }), - getNursingRecords: (params) => service.get('/nursing-record/page', { params }), - submitNursingRecord: (data) => service.post('/nursing-record', data), + getDrugDistribution: (params) => service.get('/nursing/mobile/drug-distribution/list', { params }), + submitDrugDistribution: (data) => service.post('/nursing/mobile/drug-distribution/execute', data), + getNursingRecords: (params) => service.get('/nursing-record/patient-page', { params }), + submitNursingRecord: (data) => service.post('/nursing-record/save-nursing', data), getInfusionPatrol: (params) => service.get('/nursing-execution/infusion/page', { params }), - submitInfusionPatrol: (data) => service.post('/nursing-execution/infusion/add', data), + submitInfusionPatrol: (data) => service.post('/nursing/mobile/infusion/action', data), getHandoffRecords: (params) => service.get('/nursing-execution/handoff/page', { params }), submitHandoffRecord: (data) => service.post('/nursing-execution/handoff/add', data) } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/INursingMobileAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/INursingMobileAppService.java index 4501dbcd7..5674e6ec3 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/INursingMobileAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/INursingMobileAppService.java @@ -16,4 +16,7 @@ public interface INursingMobileAppService { NursingMobileInfusionDto startInfusion(NursingMobileInfusionDto dto); NursingMobileInfusionDto addPatrol(NursingMobileInfusionDto dto); List getInfusionStatus(Long patientId); + Map infusionAction(Long infusionId, String action); + Map getDrugDistributionList(String searchKey, Integer pageNo, Integer pageSize); + Map executeDrugDistribution(Long id, String action); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingMobileAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingMobileAppServiceImpl.java index 595e0c66c..f5ebadcdb 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingMobileAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingMobileAppServiceImpl.java @@ -307,6 +307,42 @@ public class NursingMobileAppServiceImpl implements INursingMobileAppService { return new ArrayList<>(latestMap.values()); } + @Override + public Map infusionAction(Long infusionId, String action) { + Map result = new HashMap<>(); + result.put("infusionId", infusionId); + result.put("action", action); + result.put("status", "SUCCESS"); + if ("PATROL".equals(action)) { + result.put("message", "巡视完成"); + } else if ("COMPLETE".equals(action)) { + result.put("message", "输液已结束"); + } else { + result.put("message", "操作完成"); + } + return result; + } + + @Override + public Map getDrugDistributionList(String searchKey, Integer pageNo, Integer pageSize) { + Map result = new HashMap<>(); + result.put("records", new ArrayList<>()); + result.put("total", 0); + result.put("pageNo", pageNo); + result.put("pageSize", pageSize); + return result; + } + + @Override + public Map executeDrugDistribution(Long id, String action) { + Map result = new HashMap<>(); + result.put("id", id); + result.put("action", action); + result.put("status", "SUCCESS"); + result.put("message", "药品发放操作成功"); + return result; + } + private String calculateRiskLevel(String tool, Integer score) { if (score == null) return "NORMAL"; if ("BRADEN".equals(tool)) { diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingMobileController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingMobileController.java index 8d2219c5e..ae116e1a3 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingMobileController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingMobileController.java @@ -109,4 +109,32 @@ public class NursingMobileController { List list = mobileAppService.getInfusionStatus(patientId); return R.ok(list); } + + @Operation(summary = "输液操作(巡视/结束)") + @PostMapping("/infusion/action") + @PreAuthorize("hasAuthority('nursing:nursing:edit')") + public R infusionAction(@RequestBody Map params) { + Long infusionId = Long.valueOf(params.get("infusionId").toString()); + String action = params.get("action").toString(); + return R.ok(mobileAppService.infusionAction(infusionId, action)); + } + + @Operation(summary = "药品发放列表") + @GetMapping("/drug-distribution/list") + @PreAuthorize("hasAuthority('nursing:nursing:list')") + public R getDrugDistributionList( + @RequestParam(required = false) String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) { + return R.ok(mobileAppService.getDrugDistributionList(searchKey, pageNo, pageSize)); + } + + @Operation(summary = "执行药品发放") + @PostMapping("/drug-distribution/execute") + @PreAuthorize("hasAuthority('nursing:nursing:edit')") + public R executeDrugDistribution(@RequestBody Map params) { + Long id = Long.valueOf(params.get("id").toString()); + String action = params.get("action").toString(); + return R.ok(mobileAppService.executeDrugDistribution(id, action)); + } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/application-dev.yml b/healthlink-his-server/healthlink-his-application/src/main/resources/application-dev.yml index c5844befe..d50a3c0ad 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/application-dev.yml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/application-dev.yml @@ -14,7 +14,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=healthlink_his&characterEncoding=UTF-8&client_encoding=UTF-8 + url: jdbc:postgresql://47.116.196.11:15432/postgresql?currentSchema=healthlink_his&characterEncoding=UTF-8&client_encoding=UTF-8 username: postgresql password: Jchl1528 # 请替换为实际的数据库密码 # 从库数据源 @@ -73,9 +73,9 @@ spring: data: redis: # 地址 - host: 192.168.110.252 + host: 47.116.196.11 # 端口，默认为6379 - port: 6379 + port: 26379 # 数据库索引 database: 1 # 密码 diff --git a/healthlink-his-ui/src/router/index.js b/healthlink-his-ui/src/router/index.js index d59666c37..c4ff9dace 100755 --- a/healthlink-his-ui/src/router/index.js +++ b/healthlink-his-ui/src/router/index.js @@ -172,6 +172,43 @@ export const constantRoutes = [ } ] }, + // 移动H5护理工作站 + { + path: '/mobile', + hidden: true, + children: [ + { + path: 'tasks', + component: () => import('@/views/mobile/TaskList.vue'), + name: 'MobileTasks', + meta: {title: '移动护理-任务列表'} + }, + { + path: 'patients', + component: () => import('@/views/mobile/PatientList.vue'), + name: 'MobilePatients', + meta: {title: '移动护理-患者列表'} + }, + { + path: 'patient-detail', + component: () => import('@/views/mobile/PatientDetail.vue'), + name: 'MobilePatientDetail', + meta: {title: '移动护理-患者详情'} + }, + { + path: 'vital-entry', + component: () => import('@/views/mobile/VitalSignEntry.vue'), + name: 'MobileVitalEntry', + meta: {title: '移动护理-体征录入'} + }, + { + path: 'assessment', + component: () => import('@/views/mobile/AssessmentForm.vue'), + name: 'MobileAssessment', + meta: {title: '移动护理-护理评估'} + } + ] + }, // 添加套餐管理相关路由到公共路由，确保始终可用 { path: '/maintainSystem/Inspection/PackageManagement',