diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
index eb7b055..c626003 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
+import org.apache.commons.lang.StringUtils;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.query.Criteria;
 
@@ -191,44 +192,44 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
-        if (null != id) {
+        if (StringUtils.isNotBlank(id)) {
             condition = condition.and("id", id, MongoOper.IS);
         }
-        if (null != name) {
+        if (StringUtils.isNotBlank(name)) {
             condition = condition.and("name", name, MongoOper.IS);
         }
-        if(null!=itemCode){
+        if(StringUtils.isNotBlank(itemCode)){
             condition=condition.and("itemCode",itemCode,MongoOper.IS);
         }
-        if(null!=itemName){
+        if(StringUtils.isNotBlank(itemName)){
             condition=condition.and("itemName",itemName,MongoOper.IS);
         }
-        if(null!=classify){
+        if(StringUtils.isNotBlank(classify)){
             condition=condition.and("classify",classify,MongoOper.IS);
         }
-        if(null!=classifyName){
+        if(StringUtils.isNotBlank(classifyName)){
             condition=condition.and("classifyName",classifyName,MongoOper.IS);
         }
-        if (null != flag) {
+        if (StringUtils.isNotBlank(flag)) {
             condition = condition.and("flag", flag, MongoOper.IS);
         }
-        if(null!=applyDoctorCode){
+        if(StringUtils.isNotBlank(applyDoctorCode)){
             condition=condition.and("applyDoctorCode",applyDoctorCode,MongoOper.IS);
         }
-        if(null!=applyDoctorName){
+        if(StringUtils.isNotBlank(applyDoctorName)){
             condition=condition.and("applyDoctorName",applyDoctorName,MongoOper.IS);
         }
         if(null!=status){
             condition=condition.and("status",status,MongoOper.IS);
         }
 
-        if(null!=patientName){
+        if(StringUtils.isNotBlank(patientName)){
             condition=condition.and("patientName",patientName,MongoOper.IS);
         }
-        if(null!=cardNo){
+        if(StringUtils.isNotBlank(cardNo)){
             condition=condition.and("cardNo",cardNo,MongoOper.IS);
         }
-        if(null!=phone){
+        if(StringUtils.isNotBlank(phone)){
             condition=condition.and("phone",phone,MongoOper.IS);
         }
         if(null!=serviceType){
@@ -248,7 +249,7 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
             if (null==c1) {
                 c1 = Criteria.where("week").lte(endWeek);
             } else {
-                c1 = c1.and("week").lte(endWeek);
+                c1 = c1.lte(endWeek);
             }
         }
         if (c1!=null) {
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
index fa8034d..9c6f380 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
+import org.apache.commons.lang.StringUtils;
 import org.bson.types.ObjectId;
 
 /**
@@ -61,19 +62,19 @@ public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery {
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
-        if (null != id) {
+        if (StringUtils.isNotBlank(id)) {
             condition = condition.and("id", id, MongoOper.IS);
         }
         if (null != status) {
             condition = condition.and("status", status, MongoOper.IS);
         }
-        if (null != hospitalId) {
+        if (StringUtils.isNotBlank(hospitalId)) {
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
-        if(null!=vcCardNo){
+        if(StringUtils.isNotBlank(vcCardNo)){
             condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS);
         }
-        if(null!=name){
+        if(StringUtils.isNotBlank(name)){
             condition=condition.and("name",name,MongoOper.IS);
         }