From 396094f4bf99d3d685a1e544688b17a8b319cc50 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Tue, 11 May 2021 18:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=A1=B6=E9=83=A8+=E6=82=A3?=
 =?UTF-8?q?=E8=80=85=E5=90=8D=E5=AD=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java | 2 ++
 .../main/java/com/ccsens/ht/service/PatientReportService.java | 4 ++--
 ht/src/main/resources/application.yml                         | 4 ++--
 ht/src/main/resources/mapper_dao/HtPatientReportDao.xml       | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java
index 2afe78cd..3a55f747 100644
--- a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java
+++ b/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("病人年龄-结束")
diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
index 025114b6..a90a442c 100644
--- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
+++ b/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("");
diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml
index 5889ff7f..d082c0ea 100644
--- a/ht/src/main/resources/application.yml
+++ b/ht/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
\ No newline at end of file
+    active: prod
+    include: common, util-prod
\ No newline at end of file
diff --git a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml
index 375f239f..7512ff02 100644
--- a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml
+++ b/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>