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> 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.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 getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId, - List adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize, - Integer pricingFlag, List adviceTypes, String orderPricing, String categoryCode) { + List adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize, + Integer pricingFlag, List adviceTypes, String orderPricing, String categoryCode) { // 生成缓存键,处理可能的null值 String safeSearchKey = searchKey != null ? searchKey : "";