fix:[填报表单]优化

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

@@ -162,6 +162,18 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    /** 试验类型1试验，5非试验表单，10麻精药表单 */
+    @TableField(exist = false)
+    private Integer studyType;
+
+    public Integer getStudyType() {
+        return studyType;
+    }
+
+    public void setStudyType(Integer studyType) {
+        this.studyType = studyType;
+    }
+
     public String getJcbList() {
         return jcbList;
     }

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

@@ -19,7 +19,7 @@
     <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill">
         select t.*,tm.name as templateMc,tm.name_en as templateMcEn,tm.sn as templateSn,tm.show_sn as templateShowSn,tm.dept_id as templateDeptId
              ,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product,
-               tm.pdf_size as templatePdfSize,tm.show_yjcc as templateShowYjcc
+               tm.pdf_size as templatePdfSize,tm.show_yjcc as templateShowYjcc,ts.type as studyType
         FROM `t_study_form_fill` t
         join t_template tm on tm.id=t.template_id
         join t_study ts on ts.id=t.study_id