From b6eec300a9860bdf67e1f6b1035c8d22ac1e6eba Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Wed, 17 Jun 2026 15:01:38 +0800 Subject: [PATCH] =?UTF-8?q?696=20[=E6=94=B6=E8=B4=B9=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99-=E4=BD=8F=E9=99=A2=E7=99=BB=E8=AE=B0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=A7=93=E5=90=8D=E6=90=9C=E7=B4=A2=E6=A1=86=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E2=80=9C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E2=80=9D=E4=B8=8E=E2=80=9C=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AE=B5=E2=80=9D=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=8F=8A=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IInHospitalRegisterAppService.java | 2 +- .../InHospitalRegisterAppServiceImpl.java | 9 ++- .../InHospitalRegisterController.java | 8 ++- .../dto/InHospitalRegisterQueryDto.java | 10 ++++ .../mapper/InHospitalRegisterAppMapper.java | 1 + .../InHospitalRegisterAppMapper.xml | 3 + .../charge/register/components/awaitList.vue | 57 ++++++++++++++++++- .../register/components/patientRegister.vue | 4 +- 8 files changed, 83 insertions(+), 11 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java index 5b1e6c55d..71c2f66bd 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java @@ -39,7 +39,7 @@ public interface IInHospitalRegisterAppService { */ IPage getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto, String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, - Date startTime, Date endTime, Long organizationId, HttpServletRequest request); + Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request); /** * 查询患者基本信息 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index c0579990b..7b14e5062 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -174,16 +174,19 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS @Override public IPage getRegisterInfo(InHospitalRegisterQueryDto inHospitalRegisterQueryDto, String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, - Date startTime, Date endTime, Long organizationId, HttpServletRequest request) { + Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) { Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记 + // startTime/endTime 直接传给 Mapper XML 参数，不通过 QueryWrapper + inHospitalRegisterQueryDto.setStartTime(null); + inHospitalRegisterQueryDto.setEndTime(null); // 构建查询条件 QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey, - new HashSet<>(Arrays.asList("registrar", "source_name", "patient_name", "id_card")), request); + new HashSet<>(Arrays.asList("registrar", "source_name", "patient_name")), request); IPage inHospitalRegisterInfo = inHospitalRegisterAppMapper .getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus, - registeredFlag, LocationForm.WARD.getValue(), startTime, endTime, organizationId, + registeredFlag, LocationForm.WARD.getValue(), startTime, endTime, organizationId, idCard, queryWrapper); inHospitalRegisterInfo.getRecords().forEach(e -> { // 性别 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java index c01d80520..dadd2d6ed 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java @@ -8,6 +8,7 @@ import com.healthlink.his.web.inhospitalcharge.appservice.IInHospitalRegisterApp import com.healthlink.his.web.inhospitalcharge.dto.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -67,12 +68,13 @@ public class InHospitalRegisterController { @RequestParam(value = "registeredFlag") String registeredFlag, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(value = "startTime", required = false) Date startTime, - @RequestParam(value = "endTime", required = false) Date endTime, + @RequestParam(value = "startTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(value = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime, @RequestParam(value = "organizationId", required = false) Long organizationId, + @RequestParam(value = "idCard", required = false) String idCard, HttpServletRequest request) { return R.ok(iInHospitalRegisterAppService.getRegisterInfo(inHospitalRegisterQueryDto, searchKey, registeredFlag, - pageNo, pageSize, startTime, endTime, organizationId, request)); + pageNo, pageSize, startTime, endTime, organizationId, idCard, request)); } /** diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java index ba27ad257..aa6952b9d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java @@ -120,4 +120,14 @@ public class InHospitalRegisterQueryDto { */ @JsonSerialize(using = ToStringSerializer.class) private Long organizationId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 入院科室名称 + */ + private String organizationName; } \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java index 9302e5c64..275de9e25 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java @@ -39,6 +39,7 @@ public interface InHospitalRegisterAppMapper { @Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organizationId") Long organizationId, + @Param("idCard") String idCard, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); /** diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml index 2cb8459b9..38ed6edf6 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml @@ -53,6 +53,9 @@ AND ae.organization_id = #{organizationId} + + AND ap.id_card LIKE concat('%', #{idCard}, '%') + AND ae.status_enum = #{encounterStatus} diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue index 792364ecd..375025d4c 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue @@ -4,11 +4,29 @@ + + 重置 @@ -59,9 +77,15 @@ align="center" > + +