Browse Source

fix:[模板管理]优化

master
15881625488@163.com 1 week ago
parent
commit
257fada568
3 changed files with 24 additions and 1 deletions
  1. +12
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
  2. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java
  3. +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

@ -162,6 +162,10 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false)
private String templateShowYjcc;
/** 仅提交:1否;10是 */
@TableField(exist = false)
private Integer onlySubmit;
/** 试验编号 */
@TableField(exist = false)
private String studySn;
@ -178,6 +182,14 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false)
private Integer showBlxjsh;
public Integer getOnlySubmit() {
return onlySubmit;
}
public void setOnlySubmit(Integer onlySubmit) {
this.onlySubmit = onlySubmit;
}
public Integer getShowBlxjsh() {
return showBlxjsh;
}

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

@ -58,6 +58,9 @@ public class Template extends MpBaseEntity
/** 是否需要病理学家审核:1:否;10:是 */
private Integer showBlxjsh;
/** 仅提交:1否;10是 */
private Integer onlySubmit;
/** 所属试验类型:1试验,5非试验表单,10麻精药表单 */
private String studyType;
@ -77,6 +80,14 @@ public class Template extends MpBaseEntity
@TableField(exist = false)
private String deptName;
public Integer getOnlySubmit() {
return onlySubmit;
}
public void setOnlySubmit(Integer onlySubmit) {
this.onlySubmit = onlySubmit;
}
public Integer getShowBlxjsh() {
return showBlxjsh;
}

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

@ -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
,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,ts.type as studyType,tm.show_blxjsh
tm.pdf_size as templatePdfSize,tm.show_yjcc as templateShowYjcc,ts.type as studyType,tm.show_blxjsh,tm.only_submit
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