Browse Source

fix:[填报表单]优化

master
15881625488@163.com 2 months ago
parent
commit
9f1bfa898f
2 changed files with 13 additions and 1 deletions
  1. +12
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
  2. +1
    -1
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

+ 12
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java View File

@ -135,6 +135,10 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false)
private String templateExportMethod;
/** 产物:1:试剂;3:给药制剂;5:麻精药 */
@TableField(exist = false)
private Integer product;
/** 模板所属部门/学科 */
@TableField(exist = false)
private Long templateDeptId;
@ -147,6 +151,14 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false)
private String studyMc;
public Integer getProduct() {
return product;
}
public void setProduct(Integer product) {
this.product = product;
}
public String getYqResource() {
return yqResource;
}

+ 1
- 1
hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml View File

@ -18,7 +18,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
,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product
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

Loading…
Cancel
Save