jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

报告模板菜单

Browse Source
This commit is contained in:
tangw 2025-12-30 15:42:35 +08:00
parent a605ec1f8e
commit b3229c0e7d
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java
View File

@ -16,9 +16,9 @@ public class ComReportInstr {
private Long reportBgdh;
private String reportSize;
private String reportType;
private Long reportRows;
private Long reportMinrows;
private Long reportMaxrows;
private Integer reportRows;
private Integer reportMinrows;
private Integer reportMaxrows;
private String reportItems;
private Long reportSort;
private String status;

4
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReportvsitemMapper.java
View File

@ -9,8 +9,8 @@ import java.util.List;
public interface LabReportvsitemMapper {
int getLabReportvsitemCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
int getLabReport2(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
int getLabReportCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
int getLabReportCountwithitem(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("items")List<String> items);
Integer getLabReportCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
Integer getLabReportCountwithitem(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("items")List<String> items);
List<ComReportInstr> getComReportInstrByInstr(String reportYq);
String getreportCode(Long reportBgdh);
}

3
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/ReportParam.java
View File

@ -22,7 +22,8 @@ public class ReportParam {
private String yq;
private String ybh;
private String hospitalName;
private Long ReportId;
private Integer resultRows;
private Integer reportRows;
/**结果图片数组*/private String[] pic;
/**检验医生签名*/private String usernopic;
/**审核医生签名*/private String checkerpic;

9
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java
View File

@ -364,7 +364,10 @@ public class ReportUtil {
if(comReportInstr.getReportId()==null) {
return new Result("-1","未找到打印模板,请检查报告单设置");
}
reportParam.setReportId(comReportInstr.getReportId());
reportParam.setReportRows(comReportInstr.getReportRows());
Integer count=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh);
if(count==null) {count=0;}
reportParam.setResultRows(count);
String filename=labReportvsitemMapper.getreportCode(comReportInstr.getReportBgdh());
return printToPdf(filename, reportParam, UUID.randomUUID().toString(), true);
@ -394,8 +397,8 @@ public class ReportUtil {
}
int rows=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh);
for (ComReportInstr comReportInstr : info) {
Long minrows=comReportInstr.getReportMinrows();
Long maxrows=comReportInstr.getReportMaxrows();
Integer minrows=comReportInstr.getReportMinrows();
Integer maxrows=comReportInstr.getReportMaxrows();
if(minrows!=null&&minrows>0){
if(rows<minrows){continue;}
}

26
liswork/src/main/resources/mapper/ComReportInstrMapper.xml
View File

@ -117,21 +117,19 @@
<update id="updateComReportInstr" parameterType="com.czlis.common.core.domain.entity.lis.ComReportInstr">
update com_report_instr
<set>
<if test="reportType != null and reportType != ''">report_type = #{reportType},</if>
<if test="reportYq != null and reportYq != ''">report_yq = #{reportYq},</if>
<if test="reportBgdh != null and reportBgdh != 0">report_bgdh = #{reportBgdh},</if>
<if test="reportSize != null and reportSize != ''">report_size = #{reportSize},</if>
<if test="reportRows != null and reportRows != 0">report_rows = #{reportRows},</if>
<if test="reportMinrows != null and reportMinrows != 0">report_minrows = #{reportMinrows},</if>
<if test="reportMaxrows != null and reportMaxrows != 0">report_maxrows = #{reportMaxrows},</if>
<if test="reportItems != null and reportItems != ''">report_items = #{reportItems},</if>
<if test="reportSort != null">report_sort = #{reportSort},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
set report_type = #{reportType},
report_yq = #{reportYq},
report_bgdh = #{reportBgdh},
report_size = #{reportSize},
report_rows = #{reportRows},
report_minrows = #{reportMinrows},
report_maxrows = #{reportMaxrows},
report_items = #{reportItems},
report_sort = #{reportSort},
status = #{status},
remark = #{remark},
update_by = #{updateBy},
update_time = getdate()
</set>
where report_id = #{reportId}
</update>