diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java index 8b75cfca6..9427a138d 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java @@ -5,6 +5,7 @@ import com.healthlink.his.criticalvalue.service.ICriticalValueHandleRecordServic import com.healthlink.his.criticalvalue.service.ICriticalValueService; import com.healthlink.his.web.criticalvalue.appservice.ICriticalValueAppService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.core.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -86,6 +87,10 @@ public class CriticalValueAppServiceImpl implements ICriticalValueAppService { @Override @Transactional(rollbackFor = Exception.class) public void handleCriticalValue(CriticalValueHandleRecord record) { + Long userId = SecurityUtils.getUserId(); + String username = SecurityUtils.getLoginUser().getUsername(); + record.setHandlerId(userId); + record.setHandlerName(username); record.setHandleTime(new Date()); handleRecordService.save(record); if ("HANDLE".equals(record.getHandleType())) { diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V60__critical_value_handle_record.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V60__critical_value_handle_record.sql index c76215376..820c01f80 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V60__critical_value_handle_record.sql +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V60__critical_value_handle_record.sql @@ -4,7 +4,7 @@ CREATE TABLE critical_value_handle_record ( encounter_id BIGINT NOT NULL, patient_id BIGINT NOT NULL, handle_type VARCHAR(20) NOT NULL, - handler_id BIGINT NOT NULL, + handler_id BIGINT, handler_name VARCHAR(50), handle_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, handle_result TEXT, @@ -15,7 +15,9 @@ CREATE TABLE critical_value_handle_record ( tenant_id BIGINT DEFAULT 0, delete_flag CHAR(1) DEFAULT '0', create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - create_by VARCHAR(64) + create_by VARCHAR(64), + update_time TIMESTAMP, + update_by VARCHAR(64) ); COMMENT ON TABLE critical_value_handle_record IS '危急值处理记录'; COMMENT ON COLUMN critical_value_handle_record.handle_type IS '处理类型: HANDLE-处理 REVIEW-复查 CONFIRM-确认'; diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V61__fix_critical_value_handle_record_columns.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V61__fix_critical_value_handle_record_columns.sql new file mode 100644 index 000000000..fd4f2ac87 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V61__fix_critical_value_handle_record_columns.sql @@ -0,0 +1,3 @@ +ALTER TABLE critical_value_handle_record ALTER COLUMN handler_id DROP NOT NULL; +ALTER TABLE critical_value_handle_record ADD COLUMN update_time TIMESTAMP; +ALTER TABLE critical_value_handle_record ADD COLUMN update_by VARCHAR(64);