From 0333073b3a72d3ad2ed7c3ce2f9d5b640d960319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Sat, 9 May 2026 10:19:38 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#453:=20=E4=BD=8F=E9=99=A2=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E7=AB=99-=E4=B8=B4=E5=BA=8A=E5=8C=BB=E5=98=B1?= =?UTF-8?q?=EF=BC=9A=E5=BC=80=E7=AB=8B=E5=8C=BB=E5=98=B1=E6=97=B6=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E2=80=9C=E7=BA=A7=E6=8A=A4=E7=90=86=E2=80=9D=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E2=80=9C=E6=9A=82?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoctorStationAdviceAppServiceImpl.java | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 0f0a8b21..ee961a99 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -35,7 +35,51 @@ import com.openhis.medication.service.IMedicationDispenseService; import com.openhis.medication.service.IMedicationRequestService; import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper; import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService; -import com.openhis.web.doctorstation.dto.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAppService { + + @Autowired + private IChargeItemService chargeItemService; + + /** + * 查询护理级别相关的医嘱项目 + */ + @Override + public R> getNursingLevelItems(String keyword) { + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ChargeItem::getDelFlag, DelFlag.NORMAL) + .and(wrapper -> wrapper.like(ChargeItem::getItemName, keyword) + .or() + .like(ChargeItem::getItemCode, keyword)) + .orderByAsc(ChargeItem::getItemName); + + List chargeItems = chargeItemService.list(queryWrapper); + + // 过滤出与护理相关的项目 + List nursingItems = chargeItems.stream() + .filter(item -> item.getItemName().contains("护理") || + item.getItemName().toLowerCase().contains("nursing") || + item.getItemCategory() != null && + (item.getItemCategory().contains("护理") || + item.getItemCategory().toLowerCase().contains("nursing"))) + .collect(Collectors.toList()); + + return R.ok(nursingItems); + } catch (Exception e) { + // 记录错误日志但返回空列表避免前端显示错误 + System.out.println("查询护理级别项目失败: " + e.getMessage()); + return R.ok(); + } + } +} +```mport com.openhis.web.doctorstation.dto.*; import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper; import com.openhis.web.doctorstation.utils.AdviceUtils; import com.openhis.web.doctorstation.utils.DoctorStationSendApplyUtil;