From 7553c711b2e83a2365a571e2f422fc1fe6ba3857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Sat, 6 Jun 2026 11:28:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(sprint11):=20=E4=BF=AE=E5=A4=8D5=E4=B8=AA?= =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=AE=A1=E7=90=86=E5=A3=B3=E5=AD=90=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E2=80=94=20=E5=AE=A1=E6=A0=B8=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8E=E5=8D=87=E7=BA=A7=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 铁律9: 开发前审核原有代码，在已有基础上完善 - 手术管理(surgeryManage): 修正API URL→/surgery-page, 新增增删改弹窗+状态流转 - 医嘱管理(orderManage): 重构为左右布局(患者列表+医嘱), 接入advice-manage API - 入院诊断(inpatientDiagnosis): 新建InpatientDiagnosisController, 封装EncounterDiagnosis Service - 病案管理(medicalRecord): 接入inpatient-charge API, 增加费用概览+状态标签 - 费用清单(listFee): 重构为左右布局, 接入patient-prescription, 增加合计行 后端: 1个新Controller (InpatientDiagnosisController) 前端: 5个页面全部升级(1.6KB-3KB → 4.4KB-11.5KB) 编译: BUILD SUCCESS + 前端构建通过 --- .../InpatientDiagnosisController.java | 45 +++ .../inpatientDiagnosis/components/api.js | 18 +- .../inpatientDiagnosis/index.vue | 142 ++++++++-- .../listFee/components/api.js | 10 +- .../inHospitalManagement/listFee/index.vue | 117 +++++--- .../medicalRecord/components/api.js | 10 +- .../medicalRecord/index.vue | 120 ++++++-- .../orderManage/components/api.js | 35 ++- .../orderManage/index.vue | 166 +++++++---- .../surgeryManage/components/api.js | 32 ++- .../surgeryManage/index.vue | 263 ++++++++++++++++-- 11 files changed, 783 insertions(+), 175 deletions(-) create mode 100644 healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalmanage/controller/InpatientDiagnosisController.java diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalmanage/controller/InpatientDiagnosisController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalmanage/controller/InpatientDiagnosisController.java new file mode 100644 index 000000000..8b3419e97 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalmanage/controller/InpatientDiagnosisController.java @@ -0,0 +1,45 @@ +package com.healthlink.his.web.inhospitalmanage.controller; + +import com.core.common.core.domain.R; +import com.healthlink.his.administration.domain.EncounterDiagnosis; +import com.healthlink.his.administration.service.IEncounterDiagnosisService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 入院诊断管理 Controller + */ +@RestController +@RequestMapping("/inpatient-manage/diagnosis") +@Slf4j +@AllArgsConstructor +public class InpatientDiagnosisController { + + private final IEncounterDiagnosisService encounterDiagnosisService; + + @GetMapping(value = "/list") + public R> getDiagnosisList(@RequestParam Long encounterId) { + return R.ok(encounterDiagnosisService.getDiagnosisList(encounterId)); + } + + @PostMapping(value = "/add") + public R addDiagnosis(@RequestBody EncounterDiagnosis diagnosis) { + boolean result = encounterDiagnosisService.save(diagnosis); + return result ? R.ok("新增成功") : R.fail("新增失败"); + } + + @PutMapping(value = "/update") + public R updateDiagnosis(@RequestBody EncounterDiagnosis diagnosis) { + boolean result = encounterDiagnosisService.updateById(diagnosis); + return result ? R.ok("修改成功") : R.fail("修改失败"); + } + + @DeleteMapping(value = "/delete") + public R deleteDiagnosis(@RequestParam Long id) { + boolean result = encounterDiagnosisService.removeById(id); + return result ? R.ok("删除成功") : R.fail("删除失败"); + } +} diff --git a/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/components/api.js b/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/components/api.js index 651bc8330..efe4b96ec 100644 --- a/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/components/api.js +++ b/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/components/api.js @@ -1,7 +1,17 @@ import request from '@/utils/request' -export function getList(params) { - return request({ url: '/clinical-manage/surgery/page', method: 'get', params }) + +export function getDiagnosisList(encounterId) { + return request({ url: '/inpatient-manage/diagnosis/list', method: 'get', params: { encounterId } }) } -export function getDetail(id) { - return request({ url: '/clinical-manage/surgery/' + id, method: 'get' }) + +export function addDiagnosis(data) { + return request({ url: '/inpatient-manage/diagnosis/add', method: 'post', data }) +} + +export function updateDiagnosis(data) { + return request({ url: '/inpatient-manage/diagnosis/update', method: 'put', data }) +} + +export function deleteDiagnosis(id) { + return request({ url: '/inpatient-manage/diagnosis/delete', method: 'delete', params: { id } }) } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/index.vue index 60f030c0a..8c0b582af 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/inpatientDiagnosis/index.vue @@ -1,38 +1,138 @@ + - + + diff --git a/healthlink-his-ui/src/views/inHospitalManagement/listFee/components/api.js b/healthlink-his-ui/src/views/inHospitalManagement/listFee/components/api.js index 05d34d3c0..cac60a941 100644 --- a/healthlink-his-ui/src/views/inHospitalManagement/listFee/components/api.js +++ b/healthlink-his-ui/src/views/inHospitalManagement/listFee/components/api.js @@ -1,7 +1,9 @@ import request from '@/utils/request' -export function getList(params) { - return request({ url: '/charge-manage/inpatient-charge/page', method: 'get', params }) + +export function getPatientPage(params) { + return request({ url: '/charge-manage/inpatient-charge/encounter-patient-page', method: 'get', params }) } -export function getDetail(id) { - return request({ url: '/charge-manage/inpatient-charge/' + id, method: 'get' }) + +export function getPatientPrescription(encounterId) { + return request({ url: '/charge-manage/inpatient-charge/patient-prescription', method: 'get', params: { encounterId } }) } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue index 4ad9d400f..542355d51 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue @@ -1,43 +1,98 @@ + - + + diff --git a/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/components/api.js b/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/components/api.js index 05d34d3c0..cac60a941 100644 --- a/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/components/api.js +++ b/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/components/api.js @@ -1,7 +1,9 @@ import request from '@/utils/request' -export function getList(params) { - return request({ url: '/charge-manage/inpatient-charge/page', method: 'get', params }) + +export function getPatientPage(params) { + return request({ url: '/charge-manage/inpatient-charge/encounter-patient-page', method: 'get', params }) } -export function getDetail(id) { - return request({ url: '/charge-manage/inpatient-charge/' + id, method: 'get' }) + +export function getPatientPrescription(encounterId) { + return request({ url: '/charge-manage/inpatient-charge/patient-prescription', method: 'get', params: { encounterId } }) } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/index.vue index 43437d3b6..eff35ed2b 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/medicalRecord/index.vue @@ -1,43 +1,123 @@ + - + + diff --git a/healthlink-his-ui/src/views/inHospitalManagement/orderManage/components/api.js b/healthlink-his-ui/src/views/inHospitalManagement/orderManage/components/api.js index a895269e4..9f7ed3624 100644 --- a/healthlink-his-ui/src/views/inHospitalManagement/orderManage/components/api.js +++ b/healthlink-his-ui/src/views/inHospitalManagement/orderManage/components/api.js @@ -1,10 +1,33 @@ import request from '@/utils/request' -export function getOrderList(params) { - return request({ url: '/reg-doctorstation/advice-manage/page', method: 'get', params }) + +export function getPatientList(params) { + return request({ url: '/reg-doctorstation/advice-manage/reg-patient-zk', method: 'get', params }) } -export function getOrderDetail(id) { - return request({ url: '/reg-doctorstation/advice-manage/' + id, method: 'get' }) + +export function getAdviceBaseInfo(encounterId) { + return request({ url: '/reg-doctorstation/advice-manage/reg-request-base-info', method: 'get', params: { encounterId } }) } -export function cancelOrder(id) { - return request({ url: '/reg-doctorstation/advice-manage/cancel/' + id, method: 'put' }) + +export function getAdviceHistoryInfo(patientId, encounterId) { + return request({ url: '/reg-doctorstation/advice-manage/reg-request-history-info', method: 'get', params: { patientId, encounterId } }) +} + +export function saveAdvice(data) { + return request({ url: '/reg-doctorstation/advice-manage/save-reg-advice', method: 'post', data }) +} + +export function signAdvice(data) { + return request({ url: '/reg-doctorstation/advice-manage/sign-reg-advice', method: 'post', data }) +} + +export function stopAdvice(data) { + return request({ url: '/reg-doctorstation/advice-manage/stop-reg-advice', method: 'post', data }) +} + +export function cancelStopAdvice(data) { + return request({ url: '/reg-doctorstation/advice-manage/cancel-stop-reg-advice', method: 'post', data }) +} + +export function signOffAdvice(data) { + return request({ url: '/reg-doctorstation/advice-manage/sign-off-reg', method: 'post', data }) } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/orderManage/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/orderManage/index.vue index 359c44342..7e7eadfa3 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/orderManage/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/orderManage/index.vue @@ -1,65 +1,137 @@ + - + + diff --git a/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/components/api.js b/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/components/api.js index 95fd96d26..8b5e652d3 100644 --- a/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/components/api.js +++ b/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/components/api.js @@ -1,13 +1,29 @@ import request from '@/utils/request' -export function getList(params) { - return request({ url: '/clinical-manage/surgery/page', method: 'get', params }) + +export function getSurgeryPage(params) { + return request({ url: '/clinical-manage/surgery/surgery-page', method: 'get', params }) } -export function getDetail(id) { - return request({ url: '/clinical-manage/surgery/' + id, method: 'get' }) + +export function getSurgeryDetail(id) { + return request({ url: '/clinical-manage/surgery/surgery-detail', method: 'get', params: { id } }) } -export function add(data) { - return request({ url: '/clinical-manage/surgery', method: 'post', data }) + +export function addSurgery(data) { + return request({ url: '/clinical-manage/surgery/surgery', method: 'post', data }) } -export function update(data) { - return request({ url: '/clinical-manage/surgery', method: 'put', data }) + +export function updateSurgery(data) { + return request({ url: '/clinical-manage/surgery/surgery', method: 'put', data }) +} + +export function deleteSurgery(id) { + return request({ url: '/clinical-manage/surgery/surgery', method: 'delete', params: { id } }) +} + +export function updateSurgeryStatus(id, statusEnum) { + return request({ url: '/clinical-manage/surgery/surgery-status', method: 'put', params: { id, statusEnum } }) +} + +export function getEncounterList(patientId) { + return request({ url: '/clinical-manage/surgery/encounter-list', method: 'get', params: { patientId } }) } diff --git a/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/index.vue index 854051974..e901b5239 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/surgeryManage/index.vue @@ -1,57 +1,260 @@ + - + +