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