wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

360 住院护士站-》三测单：体征录入保存失败

Browse Source
This commit is contained in:
Ranyunqiao
2026-04-20 11:44:37 +08:00
parent ed75b148a8
commit 5ab4650c4e
9 changed files with 318 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
View File

@@ -36,7 +36,7 @@ public interface IVitalSignsAppService {
*
* @return 体温单检索结果
*/
R<?> searchVitalSigns(String startTime, String endTime);
R<?> searchVitalSigns(String startTime, String endTime, String patientId);
/**
* 体温单记录删除

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
View File

@@ -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<VitalSigns> vitalSignsList = vitalSignsAppMapper.searchVitalSigns(startTime, endTime);
List<VitalSigns> vitalSignsList = vitalSignsAppMapper.searchVitalSigns(startTime, endTime, patientId);
// 判断查询结果是否为空
if (vitalSignsList.isEmpty()) {
return R.ok(Collections.emptyList());

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
View File

@@ -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));
}
/**

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
View File

@@ -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;
/**

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
View File

@@ -38,9 +38,10 @@ public interface VitalSignsAppMapper {
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param patientId 患者ID
* @return 查询记录结果
*/
List<VitalSigns> searchVitalSigns(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<VitalSigns> searchVitalSigns(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("patientId") String patientId);
/**
* 删除记录

1
openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
View File

@@ -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

3
openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
View File

@@ -81,6 +81,9 @@
-- 记录日期
T1.recording_date &gt;= #{startTime}::date
AND T1.recording_date &lt;= #{endTime}::date
<if test="patientId != null and patientId != ''">
AND T1.patient_id = #{patientId}::bigint
</if>
AND T1.delete_flag = '0'
</where>