diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java index 9fba8936..272b1315 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java @@ -36,7 +36,7 @@ public interface IVitalSignsAppService { * * @return 体温单检索结果 */ - R searchVitalSigns(String startTime, String endTime); + R searchVitalSigns(String startTime, String endTime, String patientId); /** * 体温单记录删除 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java index ea58b033..5c1711b7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java @@ -266,13 +266,14 @@ public class VitalSignsAppServiceImpl implements IVitalSignsAppService { * * @param startTime 开始时间 * @param endTime 结束时间 + * @param patientId 患者ID * @return 检索结果 */ @Override - public R searchVitalSigns(String startTime, String endTime) { + public R searchVitalSigns(String startTime, String endTime, String patientId) { // 基本信息查询 - List vitalSignsList = vitalSignsAppMapper.searchVitalSigns(startTime, endTime); + List vitalSignsList = vitalSignsAppMapper.searchVitalSigns(startTime, endTime, patientId); // 判断查询结果是否为空 if (vitalSignsList.isEmpty()) { return R.ok(Collections.emptyList()); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java index e9468732..332546fb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java @@ -57,8 +57,8 @@ public class VitalSignsController { * @return 体温单检索结果 */ @GetMapping("/record-search") - public R searchVitalSigns(String startTime, String endTime) { - return R.ok(vitalSignsAppService.searchVitalSigns(startTime, endTime)); + public R searchVitalSigns(String startTime, String endTime, String patientId) { + return R.ok(vitalSignsAppService.searchVitalSigns(startTime, endTime, patientId)); } /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java index a163009c..b33d42a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java @@ -1,6 +1,7 @@ package com.openhis.web.inpatientmanage.dto; import com.core.common.core.domain.HisBaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -35,6 +36,7 @@ public class VitalSignsSaveDto extends HisBaseEntity { /** * 记录日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date recordingDate; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java index 35c77318..8d59b2a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java @@ -38,9 +38,10 @@ public interface VitalSignsAppMapper { * * @param startTime 开始时间 * @param endTime 结束时间 + * @param patientId 患者ID * @return 查询记录结果 */ - List searchVitalSigns(@Param("startTime") String startTime, @Param("endTime") String endTime); + List searchVitalSigns(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("patientId") String patientId); /** * 删除记录 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml index 8084e122..b0bfcd12 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml @@ -25,6 +25,7 @@ T2.organization_id AS org_id, --科室ID(从就诊表取) T2.id AS encounter_id, --就诊ID T2.start_time AS admissionDate, --入院日期 + T3.ward_admission_date AS wardAdmissionDate, --入科日期 T3.location_id AS ward_location_id, --病区 T4.location_id AS bed_location_id --床号 FROM adm_patient AS T1 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml index 225d6d1f..a540f5ef 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml @@ -81,6 +81,9 @@ -- 记录日期 T1.recording_date >= #{startTime}::date AND T1.recording_date <= #{endTime}::date + + AND T1.patient_id = #{patientId}::bigint + AND T1.delete_flag = '0' diff --git a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue index 7e20f059..1384b5b3 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue @@ -1,11 +1,11 @@