diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/controller/AntibioticController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/controller/AntibioticController.java index 9b714da00..df6b1b9ec 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/controller/AntibioticController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/controller/AntibioticController.java @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @Tag(name = "抗菌药物管控") -@RestController @RequestMapping("/healthlink-his/api/v1/antibiotic") +@RestController @RequestMapping("/api/v1/antibiotic") public class AntibioticController { @Autowired private IAntibioticAppService antibioticAppService; @Operation(summary = "查询药品限制规则") @GetMapping("/rules/{drugCode}") diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java index 39a8781d9..f72b36b5e 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/rationaldrug/controller/RationalDrugController.java @@ -26,7 +26,7 @@ import java.util.Map; * @author system */ @RestController -@RequestMapping("/healthlink-his/api/v1/rational-drug") +@RequestMapping("/api/v1/rational-drug") @AllArgsConstructor @Slf4j @Tag(name = "合理用药管理") diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java index d0f6cfc85..9a286f7ce 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -79,4 +79,12 @@ public interface IRequestFormManageAppService { * @return 结果 */ R withdrawRequestForm(Long requestFormId); + + /** + * 根据ID获取申请单详情 + * + * @param id 申请单ID + * @return 申请单详情 + */ + RequestFormQueryDto getRequestFormById(Long id); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index 6a750aae1..6195b4d75 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -828,4 +828,22 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer return R.ok("撤回成功"); } + + @Override + public RequestFormQueryDto getRequestFormById(Long id) { + RequestForm form = iRequestFormService.getById(id); + if (form == null) { + return null; + } + RequestFormQueryDto dto = new RequestFormQueryDto(); + dto.setRequestFormId(form.getId()); + dto.setPrescriptionNo(form.getPrescriptionNo()); + dto.setName(form.getName()); + dto.setDescJson(form.getDescJson()); + dto.setRequesterId(form.getRequesterId()); + dto.setEncounterId(form.getEncounterId()); + dto.setStatus(form.getStatus()); + dto.setCreateTime(form.getCreateTime()); + return dto; + } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java index 3b72df4cb..c68c021cd 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java @@ -191,7 +191,7 @@ public class RequestFormManageController { * 分页查询申请单 * @return 申请单 */ - @RequestMapping(value = "/get-page") + @RequestMapping(value = "/page") public R> getRequestFormPage(@RequestBody RequestFormDto requestFormDto) { return R.ok(iRequestFormManageAppService.getRequestFormPage(requestFormDto)); } @@ -235,3 +235,30 @@ public class RequestFormManageController { } } } + + // ==================== 门诊申请单管理兼容接口 ==================== + + /** + * 根据ID获取申请单详情 + */ + @GetMapping(value = "/{id}") + public R getDetail(@PathVariable Long id) { + return R.ok(iRequestFormManageAppService.getRequestFormById(id)); + } + + /** + * 撤回申请单(路径参数版本,兼容门诊申请单管理页面) + */ + @PutMapping(value = "/withdraw/{id}") + public R withdrawById(@PathVariable Long id) { + return iRequestFormManageAppService.withdrawRequestForm(id); + } + + /** + * 删除申请单(路径参数版本,兼容门诊申请单管理页面) + */ + @DeleteMapping(value = "/delete/{id}") + public R deleteById(@PathVariable Long id) { + return iRequestFormManageAppService.deleteRequestForm(id); + } +} diff --git a/healthlink-his-ui/src/api/antibiotic.js b/healthlink-his-ui/src/api/antibiotic.js new file mode 100644 index 000000000..2888cf66a --- /dev/null +++ b/healthlink-his-ui/src/api/antibiotic.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +// ==================== 抗菌药物管控 ==================== +export function getRules(drugCode) { + return request({ url: `/healthlink-his/api/v1/antibiotic/rules/${drugCode}`, method: 'get' }) +} + +export function checkRestriction(drugCode, doctorLevel) { + return request({ url: '/healthlink-his/api/v1/antibiotic/check-restriction', method: 'get', params: { drugCode, doctorLevel } }) +} + +export function requestApproval(data) { + return request({ url: '/healthlink-his/api/v1/antibiotic/approval', method: 'post', data }) +} + +export function approve(id, approverId, approverName, result) { + return request({ url: `/healthlink-his/api/v1/antibiotic/approval/${id}`, method: 'put', params: { approverId, approverName, result } }) +} + +export function getStatistics(startDate, endDate) { + return request({ url: '/healthlink-his/api/v1/antibiotic/statistics', method: 'get', params: { startDate, endDate } }) +} diff --git a/healthlink-his-ui/src/api/rationaldrug.js b/healthlink-his-ui/src/api/rationaldrug.js new file mode 100644 index 000000000..d19d0dbd5 --- /dev/null +++ b/healthlink-his-ui/src/api/rationaldrug.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// ==================== 处方审核 ==================== +export function auditPrescription(data) { + return request({ url: '/healthlink-his/api/v1/rational-drug/audit', method: 'post', data }) +} + +export function batchAudit(prescriptionIds) { + return request({ url: '/healthlink-his/api/v1/rational-drug/batch-audit', method: 'post', data: prescriptionIds }) +} + +export function getAuditStatistics() { + return request({ url: '/healthlink-his/api/v1/rational-drug/statistics', method: 'get' }) +} + +export function getAuditTrend(startDate) { + return request({ url: '/healthlink-his/api/v1/rational-drug/trend', method: 'get', params: { startDate } }) +} + +export function getAuditLog(encounterId) { + return request({ url: `/healthlink-his/api/v1/rational-drug/audit-log/${encounterId}`, method: 'get' }) +} + +// ==================== 配伍禁忌 ==================== +export function checkInteraction(drugCodes) { + return request({ url: '/healthlink-his/api/v1/rational-drug/check-interaction', method: 'post', data: drugCodes }) +} + +export function listInteractionRules(params) { + return request({ url: '/healthlink-his/api/v1/rational-drug/interaction-rules', method: 'get', params }) +} + +export function addInteractionRule(data) { + return request({ url: '/healthlink-his/api/v1/rational-drug/interaction-rules', method: 'post', data }) +} + +export function updateInteractionRule(data) { + return request({ url: '/healthlink-his/api/v1/rational-drug/interaction-rules', method: 'put', data }) +} + +export function delInteractionRule(id) { + return request({ url: `/healthlink-his/api/v1/rational-drug/interaction-rules/${id}`, method: 'delete' }) +} + +// ==================== 剂量规则 ==================== +export function listDosageRules(params) { + return request({ url: '/healthlink-his/api/v1/rational-drug/dosage-rules', method: 'get', params }) +} + +export function checkDosage(drugCode, dosage, population) { + return request({ url: '/healthlink-his/api/v1/rational-drug/check-dosage', method: 'get', params: { drugCode, dosage, population } }) +} diff --git a/healthlink-his-ui/src/views/casignature/components/SignDialog.vue b/healthlink-his-ui/src/views/casignature/components/SignDialog.vue index dcbb75aac..86f1fddec 100644 --- a/healthlink-his-ui/src/views/casignature/components/SignDialog.vue +++ b/healthlink-his-ui/src/views/casignature/components/SignDialog.vue @@ -3,9 +3,9 @@ - - - + + + @@ -22,10 +22,12 @@