导出顶部+患者名字查询

ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java

@@ -141,6 +141,8 @@ public class PatientReportDto {
     @ApiModel("查询报告单")
     @Data
     public static class AdminQueryReport {
+        @ApiModelProperty("病人名字")
+        private String patientName;
         @ApiModelProperty("病人年龄-开始")
         private Byte startAge;
         @ApiModelProperty("病人年龄-结束")

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -658,8 +658,8 @@ public class PatientReportService implements IPatientReportService {
 
         String subHead = CollectionUtil.isEmpty(reportScores) ? "" : reportScores.get(0).getName() + "(" + reportScores.get(0).getCode() + ")报告单";
         PdfUtil.Margin margin = new PdfUtil.Margin();
-        margin.setTop(12);
-        margin.setBottom(12);
+        margin.setTop(24);
+        margin.setBottom(24);
         margin.setLeft(64);
         margin.setRight(64);
         String[] split = reportPatient.getHospital().split("");

ht/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: prod
+    include: common, util-prod

ht/src/main/resources/mapper_dao/HtPatientReportDao.xml

@@ -170,6 +170,9 @@
             AND report.type = 2
             AND s.type IN ( 0, 2 )
         </if>
+        <if test="patientName != null">
+            and p.name = #{patientName}
+        </if>
         <if test="patientSex != null">
             and p.sex = #{patientSex}
         </if>