From e35d3bc23e81e308e60f42ac9e332af4983ca065 Mon Sep 17 00:00:00 2001
From: yangkexiang <1677036288@qq.com>
Date: Sat, 9 May 2026 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=86=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5=E5=92=8C=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DoctorStationAdviceAppServiceImpl.java    | 59 ++-----------------
 1 file changed, 5 insertions(+), 54 deletions(-)

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 ee961a99..088ded73 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,51 +35,7 @@ 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 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<List<ChargeItem>> getNursingLevelItems(String keyword) {
-        try {
-            LambdaQueryWrapper<ChargeItem> 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<ChargeItem> chargeItems = chargeItemService.list(queryWrapper);
-            
-            // 过滤出与护理相关的项目
-            List<ChargeItem> 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.dto.*;
 import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
 import com.openhis.web.doctorstation.utils.DoctorStationSendApplyUtil;
@@ -87,15 +43,10 @@ import com.openhis.web.doctorstation.utils.PrescriptionUtils;
 import com.openhis.web.personalization.dto.ActivityDeviceDto;
 import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
 import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IInventoryItemService;
+import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.service.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -190,8 +141,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
      */
     @Override
     public IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
-            List<Long> adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize,
-            Integer pricingFlag, List<Integer> adviceTypes, String orderPricing, String categoryCode) {
+                                                  List<Long> adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize,
+                                                  Integer pricingFlag, List<Integer> adviceTypes, String orderPricing, String categoryCode) {
 
         // 生成缓存键，处理可能的null值
         String safeSearchKey = searchKey != null ? searchKey : "";