From 8af1bb3baa44bc8e0b53db709b5f0f7960374eac Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Thu, 6 Mar 2025 15:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=85=83=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IOutpatientRegistrationAppServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java index 33537e6a..665ae1c5 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java @@ -7,9 +7,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import com.openhis.common.constant.CommonConstants; -import com.openhis.web.basicservice.dto.HealthcareServiceDto; -import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -18,11 +15,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AgeCalculatorUtil; +import com.core.common.utils.MessageUtils; import com.core.common.utils.bean.BeanUtils; import com.openhis.administration.domain.Patient; import com.openhis.administration.mapper.PatientMapper; import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.clinical.mapper.ConditionDefinitionMapper; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AdministrativeGender; import com.openhis.common.enums.PractitionerRole; import com.openhis.common.enums.PublicationStatus; @@ -32,6 +32,8 @@ import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.financial.domain.Contract; import com.openhis.financial.mapper.ContractMapper; +import com.openhis.web.basicservice.dto.HealthcareServiceDto; +import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; import com.openhis.web.outpatientservice.appservice.IOutpatientRegistrationAppService; import com.openhis.web.outpatientservice.dto.*; import com.openhis.web.outpatientservice.mapper.OutpatientRegistrationAppMapper; @@ -69,7 +71,7 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr public Page getPatientMetadataBySearchKey(String searchKey, Integer pageNo, Integer pageSize) { // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, - new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null); + new HashSet<>(Arrays.asList("id_card","name", "py_str", "wb_str")), null); // 设置排序 queryWrapper.orderByDesc("update_time"); // 患者信息 @@ -192,7 +194,8 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr */ @Override public R saveRegister(OutpatientRegistrationAddParam outpatientRegistrationAddParam) { - return null; + + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"挂号"})); } }