From 2093b2408ff8621f8f67c18173da8ab8ac06fc4d Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 7 Mar 2025 11:41:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=8C=82=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=97=85=E4=BA=BA=E6=97=B6=E8=BF=94=E5=9B=9E=E5=88=9D?= =?UTF-8?q?=E5=A4=8D=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IOutpatientRegistrationAppServiceImpl.java | 13 +++++++++---- .../web/outpatientservice/dto/PatientMetadata.java | 5 +++++ 2 files changed, 14 insertions(+), 4 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 4cbb6ef7..a87546f2 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,6 +7,8 @@ import java.util.stream.Collectors; import javax.annotation.Resource; +import com.openhis.common.enums.*; +import com.openhis.common.enums.PractitionerRole; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -24,10 +26,6 @@ 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; -import com.openhis.common.enums.WhetherContainUnknown; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; @@ -93,12 +91,19 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr // 患者信息 Page patientMetadataPage = HisPageUtils.selectPage(patientMapper, queryWrapper, pageNo, pageSize, PatientMetadata.class); + // 现有就诊过的患者id集合 + List patientIdList = + iEncounterService.list().stream().map(e -> e.getPatientId()).collect(Collectors.toList()); patientMetadataPage.getRecords().forEach(e -> { // 性别枚举 e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); // 计算年龄 e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate())); + // 初复诊 + e.setFirstEnum_enumText(patientIdList.contains(e.getId()) ? EncounterType.FOLLOW_UP.getInfo() + : EncounterType.INITIAL.getInfo()); + }); return patientMetadataPage; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java index 3f900f12..45a3436a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/PatientMetadata.java @@ -51,4 +51,9 @@ public class PatientMetadata { */ private String age; + /** + * 初复诊 + */ + private String firstEnum_enumText; + }