diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index 7e8307c..c25f5f1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -60,6 +60,9 @@ public class StudyFormFill extends MpBaseEntity /** 表单状态:1:填报中;3:已提交;5:已完成(经复核);7:已完成;9:待废止;11:已废止 */ private Integer bdzt; + /** 病例学家审核状态:1:无需审核;3:待审核;5:已审核 */ + private Integer blxjshzt; + /** 是否填报:1:未填报;10:已填报*/ private Integer sftb; @@ -98,6 +101,9 @@ public class StudyFormFill extends MpBaseEntity /** 细菌细胞信息 */ private String xbxj; + /** 已提交过数据的字段 */ + private String submittedCodes; + /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -169,6 +175,22 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private Integer studyType; + public String getSubmittedCodes() { + return submittedCodes; + } + + public void setSubmittedCodes(String submittedCodes) { + this.submittedCodes = submittedCodes; + } + + public Integer getBlxjshzt() { + return blxjshzt; + } + + public void setBlxjshzt(Integer blxjshzt) { + this.blxjshzt = blxjshzt; + } + public String getXbxj() { return xbxj; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java index e71228d..57895f9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java @@ -55,6 +55,9 @@ public class Template extends MpBaseEntity /** 填报显示药剂存储按钮:1:否;10:显示 */ private Integer showYjcc; + /** 是否需要病例学家审核:1:否;10:是 */ + private Integer showBlxjsh; + /** 所属试验类型:1试验,5非试验表单,10麻精药表单 */ private String studyType; @@ -74,6 +77,14 @@ public class Template extends MpBaseEntity @TableField(exist = false) private String deptName; + public Integer getShowBlxjsh() { + return showBlxjsh; + } + + public void setShowBlxjsh(Integer showBlxjsh) { + this.showBlxjsh = showBlxjsh; + } + public String getStudyFormType() { return studyFormType; }