Browse Source

20210821修复条件查询报告单报错

sd
zy_Java 4 years ago
parent
commit
a54db05955
  1. 8
      ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
  2. 2
      ht/src/main/resources/application-dev.yml
  3. 4
      ht/src/main/resources/application.yml
  4. 2
      tall/src/main/resources/application-dev.yml
  5. 4
      tall/src/main/resources/application.yml

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

@ -616,9 +616,11 @@ public class PatientReportService implements IPatientReportService {
@Override @Override
public PageInfo<PatientReportSearchVo.Search> search(PatientReportSearchDto.SearchList param) { public PageInfo<PatientReportSearchVo.Search> search(PatientReportSearchDto.SearchList param) {
List<PatientReportSearchVo.Search> list = new ArrayList<>();
PageHelper.startPage(param.getPageNum(), param.getPageSize()); if(CollectionUtil.isNotEmpty(param.getCodes())){
List<PatientReportSearchVo.Search> list = htPatientReportDao.search(param.getCodes()); PageHelper.startPage(param.getPageNum(), param.getPageSize());
list = htPatientReportDao.search(param.getCodes());
}
return new PageInfo<>(list); return new PageInfo<>(list);
} }

2
ht/src/main/resources/application-dev.yml

@ -8,7 +8,7 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 192.168.4.113 host: dd.tall.wiki
# host: 127.0.0.1 # host: 127.0.0.1
password: 111111 password: 111111
port: 5672 port: 5672

4
ht/src/main/resources/application.yml

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

2
tall/src/main/resources/application-dev.yml

@ -11,7 +11,7 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 192.168.4.113 host: dd.tall.wiki
# host: 127.0.0.1 # host: 127.0.0.1
password: 111111 password: 111111
port: 5672 port: 5672

4
tall/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: test active: dev
include: util-test,common include: util-dev,common
Loading…
Cancel
Save