fix:[填报表单]细胞细菌

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;
     }

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;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -617,6 +617,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setYqResource(studyFormFill.getYqResource());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFillOld.setJcbList(studyFormFill.getJcbList());
+            studyFormFillOld.setXbxj(studyFormFill.getXbxj());
             studyFormFillOld.setTjsj(new Date());
             if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {
                 studyFormFillOld.setEndDate(new Date());
@@ -624,6 +625,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 studyFormFillOld.setCzlist(studyFormFill.getCzlist());
                 //生成检测板
                 genJcbList(studyFormFillOld, studyFormFill.getRemark());
+                //生成细胞细菌
+                genXbxj(studyFormFill, studyFormFill.getRemark());
             }
             //生成物资
             genResource(studyFormFillOld, studyFormFill.getRemark());
@@ -652,6 +655,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             this.save(studyFormFill);
             //生成检测板
             genJcbList(studyFormFill, studyFormFill.getRemark());
+            //生成细胞细菌
+            genXbxj(studyFormFill, studyFormFill.getRemark());
             //生成物资
             genResource(studyFormFill, studyFormFill.getRemark());
             //稽查轨迹
@@ -683,6 +688,18 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     }
 
     /**
+     * 生成细胞细菌
+     *
+     * @param studyFormFill
+     * @param remark
+     */
+    public void genXbxj(StudyFormFill studyFormFill, String remark) {
+        if(StringUtils.isNoneBlank(studyFormFill.getXbxj())){
+            //todo
+        }
+    }
+
+    /**
      * 生成物资
      *
      * @param studyFormFill