diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
index aaaf7f4..09d8cda 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
@@ -35,8 +35,8 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
     private String rsResult;//妊娠结局
     private Date applyDateStart;//申请开始时间
     private Date applyDateEnd;//申请结束时间
-    private String resultDateStart;//诊断出具开始时间
-    private String resultDateEnd;//诊断出具结束时间
+    private Date resultDateStart;//诊断出具开始时间
+    private Date resultDateEnd;//诊断出具结束时间
     private String specimenNo;//标本号
     private String collectHospitalId;//申请医院
 
@@ -185,19 +185,19 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
         this.applyDateEnd = applyDateEnd;
     }
 
-    public String getResultDateStart() {
+    public Date getResultDateStart() {
         return resultDateStart;
     }
 
-    public void setResultDateStart(String resultDateStart) {
+    public void setResultDateStart(Date resultDateStart) {
         this.resultDateStart = resultDateStart;
     }
 
-    public String getResultDateEnd() {
+    public Date getResultDateEnd() {
         return resultDateEnd;
     }
 
-    public void setResultDateEnd(String resultDateEnd) {
+    public void setResultDateEnd(Date resultDateEnd) {
         this.resultDateEnd = resultDateEnd;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
index c65ab11..19969bc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
@@ -190,7 +190,6 @@ public class DiagnosisFacaed {
      */
     public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
         DiagnosisModel diagnosisModel = dataresult.convertToDataModel();
-        diagnosisModel.setDiaStatus("1");
         diagnosisModel.setCreated(new Date());
         diagnosisModel.setModified(new Date());
         String hospital = autoMatchFacade.getHospitalId(userId);
@@ -208,6 +207,7 @@ public class DiagnosisFacaed {
             objectResponse.setErrormsg("成功");
             return objectResponse;
         }else{//新增数据
+            diagnosisModel.setDiaStatus("1");//已申请状态
             diagnosisModel.setStatus("1");
             diagnosisModel.setRefStatus("0");
             //查询孕妇基本信息
@@ -288,11 +288,12 @@ public class DiagnosisFacaed {
                 diagnosisQuery.setApplyDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
             }
         }
-        if(null != dataresult.getResultDateStart()){
-            diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
-        }
-        if(null != dataresult.getResultDateEnd()){
-            diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
+        if(null != dataresult.getResultDate()){
+            String[] dates = dataresult.getResultDate().split(" - ");
+            diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+            }
         }
 
         diagnosisQuery.setPage(dataresult.getPage());
@@ -363,6 +364,28 @@ public class DiagnosisFacaed {
 
 
     /**
+     * 产前诊断管理修改状态（实验室接收按钮）
+     * @param id
+     * @param userId
+     * @return
+     */
+    public BaseObjectResponse updateDiaStarts(String id,Integer userId){
+        BaseObjectResponse br = new BaseObjectResponse();
+        String hospital = autoMatchFacade.getHospitalId(userId);
+        DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
+        DiagnosisModel dia = new DiagnosisModel();
+        dia = diagnosisService.findOneDiagnosisById(id);
+
+        diagnosisQuery.setDiaStatus("2");
+
+
+        return null;
+    }
+
+
+
+
+    /**
      * 产筛实验室（产前诊断管理）
      * @param dataresult
      * @return
@@ -388,11 +411,12 @@ public class DiagnosisFacaed {
         if(null != dataresult.getDiaStatus()){
             diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
         }
-        if(null != dataresult.getResultDateStart()){
-            diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
-        }
-        if(null != dataresult.getResultDateEnd()){
-            diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
+        if(null != dataresult.getResultDate()){
+            String[] dates = dataresult.getResultDate().split(" - ");
+            diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+            }
         }
         if(null != dataresult.getQueryNo()){
             diagnosisQuery.setQueryNo(dataresult.getQueryNo());
@@ -417,38 +441,38 @@ public class DiagnosisFacaed {
             diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
             return diagnosisManagerResult;
         }
-        for(DiagnosisModel diagnosisModel : diaList){
-
-            if(StringUtils.isEmpty(diagnosisModel.getParentId())){
-                continue;
-            }
-            //查询孕妇基本信息
-            Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
+            for (DiagnosisModel diagnosisModel : diaList) {
 
-            SieveQuery sieveQuery = new SieveQuery();
-            sieveQuery.setParentId(diagnosisModel.getParentId());
-            //查询产筛list
-            List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
-            if(list != null && list.size() > 0){
-                SieveModel sieveModel = list.get(0);
-                diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
-                diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
-                diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
-                if("0".equals(sieveModel.getZtfx())){
-                    diagnosisModel.setZtfx("0");
-                    diagnosisModel.setZtfeText("低风险");
-                }
-                if("1".equals(sieveModel.getZtfx())){
-                    diagnosisModel.setZtfx("1");
-                    diagnosisModel.setZtfeText("临界值");
+                if (StringUtils.isEmpty(diagnosisModel.getParentId())) {
+                    continue;
                 }
-                if("2".equals(sieveModel.getZtfx())){
-                    diagnosisModel.setZtfx("2");
-                    diagnosisModel.setZtfeText("高风险");
+                //查询孕妇基本信息
+                Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
+
+                SieveQuery sieveQuery = new SieveQuery();
+                sieveQuery.setParentId(diagnosisModel.getParentId());
+                //查询产筛list
+                List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
+                if (list != null && list.size() > 0) {
+                    SieveModel sieveModel = list.get(0);
+                    diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
+                    diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
+                    diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
+                    if ("0".equals(sieveModel.getZtfx())) {
+                        diagnosisModel.setZtfx("0");
+                        diagnosisModel.setZtfeText("低风险");
+                    }
+                    if ("1".equals(sieveModel.getZtfx())) {
+                        diagnosisModel.setZtfx("1");
+                        diagnosisModel.setZtfeText("临界值");
+                    }
+                    if ("2".equals(sieveModel.getZtfx())) {
+                        diagnosisModel.setZtfx("2");
+                        diagnosisModel.setZtfeText("高风险");
+                    }
                 }
+                mList.add(diagnosisModel.contomap(patients));
             }
-            mList.add(diagnosisModel.contomap(patients));
-        }
         diagnosisManagerResult.setData(diaList);
         diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
         diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);