From 27f82d19f9d0e3a6126a556a6b63164085c92ea6 Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Thu, 20 Oct 2016 10:30:48 +0800
Subject: [PATCH] add import test

---
 .../com/lyms/platform/biz/service/LisCrisisItemService.java    |  2 +-
 .../main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java
index bb7b296..41c35bd 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java
@@ -34,7 +34,7 @@ public class LisCrisisItemService {
             query.mysqlBuild(lisCrisisItemDao.queryLisCrisisItemCount(mongoQuery));
             mongoQuery.start(query.getOffset()).end(query.getLimit());
         }
-        return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery());
+        return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery().addOrder(Sort.Direction.DESC, "publishTime"));
     }
 
     public void updateLisCrisisItem(LisCrisisItem obj, String id) {
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index ea2f277..9aa3eb9 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -1,10 +1,13 @@
 package com.lyms.hospitalapi.qhdfy;
 
+import com.lyms.platform.biz.dal.AssayConfigDao;
 import com.lyms.platform.biz.param.AssayConfigQuery;
 import com.lyms.platform.biz.service.AssayConfigService;
 import com.lyms.platform.biz.service.LisCrisisItemService;
 import com.lyms.platform.biz.service.LisReportService;
 import com.lyms.platform.biz.service.PatientsService;
+import com.lyms.platform.common.dao.operator.MongoCondition;
+import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.LisReportQuery;
@@ -33,7 +36,7 @@ public class QhdfyHisService {
     private LisReportService lisReportService;
 
     @Autowired
-    private AssayConfigService assayConfigService;
+    private AssayConfigDao assayConfigDao;
 
     @Autowired
     private LisCrisisItemService lisCrisisItemService;
@@ -59,9 +62,8 @@ public class QhdfyHisService {
                 Object[] params = {startDate};
                 List<LisReport> list = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class));
                 if (list.size() > 0) {
-                    AssayConfigQuery assayConfigQuery = new AssayConfigQuery();
-                    assayConfigQuery.setHospitalId(hospitalId+"");
-                    List<AssayConfig> assayConfigList = assayConfigService.query(assayConfigQuery);
+                    MongoCondition mongoCondition = MongoCondition.newInstance("hospitalId", ""+hospitalId, MongoOper.IS);
+                    List<AssayConfig> assayConfigList = assayConfigDao.query(mongoCondition.toMongoQuery());
                     Map<String, AssayConfig>  assayConfigMap = new HashMap<>();
                     for (AssayConfig config:assayConfigList) {
                         assayConfigMap.put(config.getProjectCode(), config);
-- 
1.8.3.1