主要修复: - 检查申请医嘱类型正确设置为诊疗(3),避免被错误归类为药品 - 检查申请收费项获取真实自费账户,预结算验证accountId必须有效存在 - 签发时补充诊疗费用项诊断关联信息变更模块: - ExamApplyController:使用ItemType枚举,获取真实账户替代占位值0 -DoctorStationAdviceAppService:按枚举标准分类医嘱,验证accountId有效性 - IChargeBillService:productId=0时从ServiceRequest.contentJson获取项目名称 - PaymentRecService:预结算自动修复账户不存在的历史数据 - Mapper:排除衍生执行记录,productId=0时补充查询逻辑 - ServiceRequest实体:activityId字段添加ALWAYS插入策略
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package com.openhis.workflow.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldStrategy;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.core.common.core.domain.HisBaseEntity;
|
||||
@@ -64,6 +66,7 @@ public class ServiceRequest extends HisBaseEntity {
|
||||
private Integer performFlag;
|
||||
|
||||
/** 诊疗定义id */
|
||||
@TableField(insertStrategy = FieldStrategy.ALWAYS)
|
||||
private Long activityId;
|
||||
|
||||
/** 数量 */
|
||||
|
||||
Reference in New Issue
Block a user