diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java
index 047db6d..02dd3d5 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java
@@ -21,14 +21,21 @@ public class AssayConfigService {
 
     public List<AssayConfig> query(AssayConfigParam assayConfigRequest) {
         MongoCondition mongoCondition = MongoCondition.newInstance();
-        if(0 != assayConfigRequest.getType()) {
-            mongoCondition.andCondition(new MongoCondition("type", assayConfigRequest.getType(), MongoOper.IS));
+
+        if(1 == assayConfigRequest.getType()) {
+            mongoCondition=MongoCondition.newInstance("projectName", assayConfigRequest.getKeywords(), MongoOper.LIKE);
+        }
+        if(2 == assayConfigRequest.getType()) {
+            mongoCondition=MongoCondition.newInstance("projectCode", assayConfigRequest.getKeywords(), MongoOper.IS);
         }
-        if(null != assayConfigRequest.getKeywords()) {
-            mongoCondition.andCondition(new MongoCondition("keywords", assayConfigRequest.getKeywords(), MongoOper.LIKE));
+        if(3 == assayConfigRequest.getType()) {
+            mongoCondition=MongoCondition.newInstance("standardCode", assayConfigRequest.getKeywords(), MongoOper.IS);
         }
+//        if(null != assayConfigRequest.getKeywords()) {
+//            mongoCondition= mongoCondition.and("projectName", assayConfigRequest.getKeywords(), MongoOper.LIKE);
+//        }
         if(null != assayConfigRequest.getHospitalId()) {
-            mongoCondition.andCondition(new MongoCondition("hospitalId", assayConfigRequest.getHospitalId(), MongoOper.IS));
+            mongoCondition=  mongoCondition.and("hospitalId", assayConfigRequest.getHospitalId(), MongoOper.IS);
         }
 
         return  assayConfigDao.query(mongoCondition.toMongoQuery().start(0).end(100));
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
index debdf00..63dc444 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
@@ -14,6 +14,66 @@ public class AssayConfig extends BaseModel {
 
     private String print;
 
+    private String hospitalId;
+    private String projectCode;
+    private String standardCode;
+    private String projectName;
+    private String classify;    //检验分类
+    private String resultType;  //结果类型
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getStandardCode() {
+        return standardCode;
+    }
+
+    public void setStandardCode(String standardCode) {
+        this.standardCode = standardCode;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getClassify() {
+        return classify;
+    }
+
+    public void setClassify(String classify) {
+        this.classify = classify;
+    }
+
+    public String getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(String resultType) {
+        this.resultType = resultType;
+    }
+
     public String getPrint() {
         return print;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
index aa90898..3c4b711 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
@@ -2,14 +2,20 @@ package com.lyms.platform.operate.web.controller;
 
 
 import com.lyms.platform.biz.service.AssayConfigService;
+import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
+import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.params.AssayConfigParam;
 import com.lyms.platform.pojo.AssayConfig;
+import org.jboss.netty.handler.codec.http.HttpResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 //化验项配置
@@ -21,6 +27,7 @@ public class AssayConfigController {
 
     @RequestMapping(method = RequestMethod.GET, value = "/assayconfig")
     @ResponseBody
+    @TokenRequired
     public BaseListResponse assayConfig(AssayConfigParam assayConfigParam) {
         List<AssayConfig> data = assayConfigService.query(assayConfigParam);
         BaseListResponse baseListResponse = new BaseListResponse();
@@ -32,6 +39,7 @@ public class AssayConfigController {
 
     @RequestMapping(method = RequestMethod.PUT, value = "/assayconfig")
     @ResponseBody
+    @TokenRequired
     public BaseListResponse assayConfig(@RequestBody List<AssayConfig> assayConfigs) {
         assayConfigService.updateForList(assayConfigs);
         BaseListResponse baseListResponse = new BaseListResponse();
@@ -40,6 +48,24 @@ public class AssayConfigController {
         return baseListResponse;
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/assayconfig/test")
+    public void testData(HttpServletResponse response) {
+        for(int i=0;i<10;i++) {
+            AssayConfig assayConfig = new AssayConfig();
+            assayConfig.setHospitalId("2");
+            assayConfig.setYn(String.valueOf(YnEnums.YES.getId()));
+            assayConfig.setClassify("classify" + i);
+            assayConfig.setPrint("1");
+            assayConfig.setProjectCode("projectCode" + i);
+            assayConfig.setResultType("resulttype" + i);
+            assayConfig.setStandardCode("standardCode" + i);
+
+            assayConfig.setProjectName("projectName" + i);
+            assayConfigService.save(assayConfig);
+        }
+        ResultUtils.buildSuccessResultAndWrite(response, "ok");
+    }
+
 
 
 }
\ No newline at end of file