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 fbc64ab..7e8307c 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 @@ -95,6 +95,9 @@ public class StudyFormFill extends MpBaseEntity /** 字段勾选记录 */ private String zdgxjl; + /** 细菌细胞信息 */ + private String xbxj; + /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -166,6 +169,14 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private Integer studyType; + public String getXbxj() { + return xbxj; + } + + public void setXbxj(String xbxj) { + this.xbxj = xbxj; + } + public Integer getStudyType() { return studyType; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java index c63dab3..44bf1dc 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.template; /** - * 产物:1:试剂;3:给药制剂;5:麻精药;7:无 9:细菌 11:细胞 + * 产物:1:试剂;3:给药制剂;5:麻精药;7:无 * @author tanfei */ public enum ProductEnum { @@ -24,17 +24,7 @@ public enum ProductEnum { /** * 无 */ - none(7, "无"), - - /** - * 细菌 - */ - Bacteria(9, "细菌"), - - /** - * 细胞 - */ - Cell(11, "细胞"); + none(7, "无"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 5443393..e3e31ac 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -617,6 +617,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl