diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java index c77a6e34..bd89bb87 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java @@ -27,11 +27,6 @@ public interface IOutpatientSkinTestRecordService { */ List getSkinTestResult(); - /** - * 获取药品状态列表 - */ - List getMedicationStatus(); - /** * 分页查询门诊皮试记录,可选条件 * diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java index 82a05e05..a8b995fa 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java @@ -110,24 +110,6 @@ public class OutpatientSkinTestRecordServiceImpl implements IOutpatientSkinTestR return dtos; } - /** - * 获取药品状态列表 - */ - @Override - public List getMedicationStatus() { - // 获取药品状态列表 - List statusList = Arrays.asList(EventStatus.values()); - List dtos = new ArrayList<>(); - // 取得更新值 - for (EventStatus status : statusList) { - PatientListDto dto = new PatientListDto(); - dto.setValue(status.getValue()); - dto.setInfo(status.getInfo()); - dtos.add(dto); - } - return dtos; - } - /** * 分页查询门诊皮试记录,可选条件 * diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java index a09cc463..27fdea6e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java @@ -47,16 +47,6 @@ public class OutpatientSkinTestRecordController { return R.ok(OutpatientSkinTestRecordService.getSkinTestResult()); } - - /** - * 获取药品状态列表 - */ - @GetMapping("/list-medicationstatus") - public R getMedicationStatus() { - - return R.ok(OutpatientSkinTestRecordService.getMedicationStatus()); - } - /** * 护士确认执行皮试后,更新皮试记录信息 *