jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 27f82d19f9d0e3a6126a556a6b63164085c92ea6

Authored by hanshaofeng
1 parent c454be6699
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

add import test

Showing 2 changed files with 7 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java View file @ 27f82d1
... ... @@ -34,7 +34,7 @@
34 34 query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery));
35 35 mongoQuery.start(query.getOffset()).end(query.getLimit());
36 36 }
37   - return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery());
  37 + return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery().addOrder(Sort.Direction.DESC, "publishTime"));
38 38 }
39 39  
40 40 public void updateLisCrisisItem(LisCrisisItem obj, String id) {
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 27f82d1
1 1 package com.lyms.hospitalapi.qhdfy;
2 2  
  3 +import com.lyms.platform.biz.dal.AssayConfigDao;
3 4 import com.lyms.platform.biz.param.AssayConfigQuery;
4 5 import com.lyms.platform.biz.service.AssayConfigService;
5 6 import com.lyms.platform.biz.service.LisCrisisItemService;
6 7 import com.lyms.platform.biz.service.LisReportService;
7 8 import com.lyms.platform.biz.service.PatientsService;
  9 +import com.lyms.platform.common.dao.operator.MongoCondition;
  10 +import com.lyms.platform.common.dao.operator.MongoOper;
8 11 import com.lyms.platform.common.utils.DateUtil;
9 12 import com.lyms.platform.pojo.*;
10 13 import com.lyms.platform.query.LisReportQuery;
... ... @@ -33,7 +36,7 @@
33 36 private LisReportService lisReportService;
34 37  
35 38 @Autowired
36   - private AssayConfigService assayConfigService;
  39 + private AssayConfigDao assayConfigDao;
37 40  
38 41 @Autowired
39 42 private LisCrisisItemService lisCrisisItemService;
... ... @@ -59,9 +62,8 @@
59 62 Object[] params = {startDate};
60 63 List<LisReport> list = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class));
61 64 if (list.size() > 0) {
62   - AssayConfigQuery assayConfigQuery = new AssayConfigQuery();
63   - assayConfigQuery.setHospitalId(hospitalId+"");
64   - List<AssayConfig> assayConfigList = assayConfigService.query(assayConfigQuery);
  65 + MongoCondition mongoCondition = MongoCondition.newInstance("hospitalId", ""+hospitalId, MongoOper.IS);
  66 + List<AssayConfig> assayConfigList = assayConfigDao.query(mongoCondition.toMongoQuery());
65 67 Map<String, AssayConfig> assayConfigMap = new HashMap<>();
66 68 for (AssayConfig config:assayConfigList) {
67 69 assayConfigMap.put(config.getProjectCode(), config);