fix：[试验管理]bug修改

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java

@@ -46,9 +46,12 @@ public class Template extends MpBaseEntity
     /** 类型：1：普通模板；10：敏感模板 */
     private Integer type;
 
-    /** 产物：1：试剂；3：供试品；5：给药制剂；7：麻精药 */
+    /** 产物：1：试剂；3：给药制剂；5：麻精药 */
     private Integer product;
 
+    /** 填报显示观察按钮：1：否；10：显示 */
+    private Integer showGc;
+
     /** 显示的编号 */
     private String showSn;
 
@@ -56,6 +59,14 @@ public class Template extends MpBaseEntity
     @TableField(exist = false)
     private String deptName;
 
+    public Integer getShowGc() {
+        return showGc;
+    }
+
+    public void setShowGc(Integer showGc) {
+        this.showGc = showGc;
+    }
+
     public String getExportMethod() {
         return exportMethod;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillListDto.java

@@ -13,6 +13,17 @@ public class StudyFormFillListDto extends StudyFormFill {
      */
     private Long subjectLeader;
 
+    /** 填报显示观察按钮：1：否；10：显示 */
+    private Integer showGc;
+
+    public Integer getShowGc() {
+        return showGc;
+    }
+
+    public void setShowGc(Integer showGc) {
+        this.showGc = showGc;
+    }
+
     public Long getSubjectLeader() {
         return subjectLeader;
     }

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：麻精药
+ * 产物：1：试剂；3：给药制剂；5：麻精药；7：无
  * @author tanfei
  */
 public enum ProductEnum {
@@ -12,19 +12,19 @@ public enum ProductEnum {
     Sj(1, "试剂"),
 
     /**
-     * 供试品
+     * 给药制剂
      */
-    Gsp(3, "供试品"),
+    Gyzj(3, "给药制剂"),
 
     /**
-     * 给药制剂
+     * 麻精药
      */
-    Gyzj(5, "给药制剂"),
+    Mjy(5, "麻精药"),
 
     /**
-     * 麻精药
+     * 无
      */
-    Mjy(7, "麻精药");
+    none(7, "无");
 
     private int value;
     private String text;

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

@@ -325,6 +325,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setBdnr(studyFormFill.getBdnr());
             studyFormFillOld.setResource(studyFormFill.getResource());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
+            studyFormFillOld.setTjsj(new Date());
             if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {
                 studyFormFillOld.setEndDate(new Date());
                 studyFormFillOld.setCclist(studyFormFill.getCclist());
@@ -351,6 +352,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFill.setUserMc(SecurityUtils.getNickName());
             studyFormFill.setSftb(NormalEnum.yes.getValue());
             studyFormFill.setBdbh(getSn(studyFormFill));
+            studyFormFill.setTjsj(new Date());
             this.save(studyFormFill);
             //生成物资
             genResource(studyFormFill);
@@ -373,9 +375,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         if (template.getProduct().equals(ProductEnum.Sj.getValue())) {
             sjService.genResource(studyFormFill, template);
         }
-        if (template.getProduct().equals(ProductEnum.Gsp.getValue())) {
-
-        }
         if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
 
         }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto">
         select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
-        ,ss.leader as subjectLeader,t.sfbl
+        ,ss.leader as subjectLeader,t.sfbl,tm.show_gc
         FROM `t_study_form_fill` t
         join t_template tm on tm.id=t.template_id
         join t_study_subject ss on t.study_subject_id=ss.id

hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.TemplateMapper">
     <select id="queryList">
-        SELECT t.`id`,t.`sn`,t.`show_sn`,t.`name`,t.`dept_id`,t.`status`,t.`need_pre`,t.`type`,d.`dept_name`
+        SELECT t.`id`,t.`sn`,t.`show_sn`,t.`name`,t.`dept_id`,t.`status`,t.`need_pre`,t.`type`,d.`dept_name`,t.product
         FROM `t_template` t
         LEFT JOIN `sys_dept` d ON t.`dept_id`=d.`dept_id`
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">