diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
index 6a584cb..6269f82 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
@@ -1,43 +1,49 @@
 package com.lyms.platform.biz.dal.impl;
 
 import com.lyms.platform.biz.dal.IPatientDao;
+import com.lyms.platform.common.dao.BaseMongoDAOImpl;
 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 com.lyms.platform.common.dao.operator.Page;
 import com.lyms.platform.pojo.Patients;
-import com.lyms.platform.common.dao.BaseMongoDAOImpl;
+import org.bson.types.ObjectId;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 /**
- *
  * 患者模型
- *
- *
+ * <p>
+ * <p>
  * Created by Administrator on 2016/4/22 0022.
  */
 @Repository("patientDaoImpl")
-public class PatientDaoImpl extends BaseMongoDAOImpl<Patients> implements IPatientDao  {
+public class PatientDaoImpl extends BaseMongoDAOImpl<Patients> implements IPatientDao {
     @Override
     public Patients addPatient(Patients obj) {
-         return save(obj);
+        return save(obj);
     }
 
     @Override
     public void updatePatient(Patients obj, String id) {
-        update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
+        boolean check = ObjectId.isValid(id);
+        if (check) {
+            update(new MongoQuery(new MongoCondition("id", new ObjectId(id), MongoOper.IS)).convertToMongoQuery(), obj);
+        }
     }
 
     @Override
     public void deletePatient(String id) {
-        delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery());
+        boolean check = ObjectId.isValid(id);
+        if (check) {
+            delete(new MongoQuery(new MongoCondition("id", new ObjectId(id), MongoOper.IS)).convertToMongoQuery());
+        }
     }
 
     @Override
     public Patients getPatient(String id) {
-         return findById(id);
+        return findById(id);
     }
 
     @Override
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
index 53c795e..991a7a1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
@@ -84,6 +84,71 @@ public class Patients extends BaseModel {
 
     private Integer patientLevel;
 
+    private String lastCheckEmployeeId;
+    private Integer lastReportId;
+
+    private String riskFactorId;
+    private String riskGroupId;
+    private Integer serviceType;
+    private Integer vip;
+    private String lastReportDoctorName;
+
+    public String getLastCheckEmployeeId() {
+        return lastCheckEmployeeId;
+    }
+
+    public void setLastCheckEmployeeId(String lastCheckEmployeeId) {
+        this.lastCheckEmployeeId = lastCheckEmployeeId;
+    }
+
+    public String getLastReportDoctorName() {
+        return lastReportDoctorName;
+    }
+
+    public void setLastReportDoctorName(String lastReportDoctorName) {
+        this.lastReportDoctorName = lastReportDoctorName;
+    }
+
+    public Integer getLastReportId() {
+        return lastReportId;
+    }
+
+    public void setLastReportId(Integer lastReportId) {
+        this.lastReportId = lastReportId;
+    }
+
+    public String getRiskFactorId() {
+        return riskFactorId;
+    }
+
+    public void setRiskFactorId(String riskFactorId) {
+        this.riskFactorId = riskFactorId;
+    }
+
+    public String getRiskGroupId() {
+        return riskGroupId;
+    }
+
+    public void setRiskGroupId(String riskGroupId) {
+        this.riskGroupId = riskGroupId;
+    }
+
+    public Integer getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(Integer serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public Integer getVip() {
+        return vip;
+    }
+
+    public void setVip(Integer vip) {
+        this.vip = vip;
+    }
+
     public Integer getPatientLevel() {
         return patientLevel;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 6f31f45..f612c58 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -67,7 +67,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{
     /**
      * 是否有效
      */
-    private int yn;
+    private int yn=-1;
     
     
     public String getCardNo() {
@@ -159,6 +159,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{
         if(null!=cardNo){
             condition=condition.and("cardno", cardNo, MongoOper.IS);
         }
+        if(-1!=yn){
+            condition=condition.and("yn", yn, MongoOper.IS);
+        }
         /*if(null!=dueDateStart){
 //            condition= condition.elemMatch("dueDate",MongoCondition.newInstance("$lte", dueDateStart, MongoOper.IS).and("$gte", dueDateEnd, MongoOper.IS));
 //            condition=condition.and("dueDate", dueDateStart, MongoOper.GTE).and("dueDate", dueDateEnd, MongoOper.LTE);