From a54db05955593fd52536901e8a435599d3978368 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Aug 2021 12:08:07 +0800 Subject: [PATCH] =?UTF-8?q?20210821=E4=BF=AE=E5=A4=8D=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=91=8A=E5=8D=95=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/ht/service/PatientReportService.java | 8 +++++--- ht/src/main/resources/application-dev.yml | 2 +- ht/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/application-dev.yml | 2 +- tall/src/main/resources/application.yml | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) 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 30d78975..59619252 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -616,9 +616,11 @@ public class PatientReportService implements IPatientReportService { @Override public PageInfo search(PatientReportSearchDto.SearchList param) { - - PageHelper.startPage(param.getPageNum(), param.getPageSize()); - List list = htPatientReportDao.search(param.getCodes()); + List list = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(param.getCodes())){ + PageHelper.startPage(param.getPageNum(), param.getPageSize()); + list = htPatientReportDao.search(param.getCodes()); + } return new PageInfo<>(list); } diff --git a/ht/src/main/resources/application-dev.yml b/ht/src/main/resources/application-dev.yml index 9e1b44dd..21715c80 100644 --- a/ht/src/main/resources/application-dev.yml +++ b/ht/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 192.168.4.113 + host: dd.tall.wiki # host: 127.0.0.1 password: 111111 port: 5672 diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index f59084b0..b9b264a7 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index 35e6d4f6..649514b8 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 192.168.4.113 + host: dd.tall.wiki # host: 127.0.0.1 password: 111111 port: 5672 diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index eca66951..1d881c2f 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: util-test,common \ No newline at end of file + active: dev + include: util-dev,common \ No newline at end of file