diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
index 90ed1a6..eb2e50c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
@@ -21,7 +21,7 @@ public class DiagnosisModel extends BaseModel {
     private String dueWeek;//孕周
     private Date yChanQi;//预产期
     private String phone;//联系方式
-    private String diaProject;//诊断项目(1,羊水穿刺；2，)
+    private String diaProject;//诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
     private Date birth;//出生日期
     private String weight;//体重
     private Date lastMenses;//末次月经
@@ -37,7 +37,8 @@ public class DiagnosisModel extends BaseModel {
     private String collectHospitalId;//申请医院
     private Date created;//创建时间
     private Date modified;//修改时间
-    private String status;//数据来源(1,申请过来的，2，自动流转过来)
+    private String status;//数据来源(1,申请过来的；2，自动流转过来)
+    private String diaStatus;//数据状态（0，未申请；1，已申请；2，已接收；3，已诊断）
 
     public String getId() {
         return id;
@@ -246,4 +247,12 @@ public class DiagnosisModel extends BaseModel {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getDiaStatus() {
+        return diaStatus;
+    }
+
+    public void setDiaStatus(String diaStatus) {
+        this.diaStatus = diaStatus;
+    }
 }
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 e4f6f72..14b1c4a 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
@@ -2,6 +2,8 @@ package com.lyms.platform.query;
 
 import com.lyms.platform.common.base.IConvertToNativeQuery;
 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;
 
 /**
@@ -13,11 +15,49 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery {
     private String id;
     private String parentId;//孕妇建档ID
     private String  queryNos;//查询号
+    private String diaStatus;//数据状态
 
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 
+    public String getQueryNos() {
+        return queryNos;
+    }
+
+    public void setQueryNos(String queryNos) {
+        this.queryNos = queryNos;
+    }
+
+    public String getDiaStatus() {
+        return diaStatus;
+    }
+
+    public void setDiaStatus(String diaStatus) {
+        this.diaStatus = diaStatus;
+    }
 
     public MongoQuery convertToQuery() {
-        return null;
+        MongoCondition condition = MongoCondition.newInstance();
+        if(null != id){
+            condition = condition.and("id", id, MongoOper.IS);
+        }
+        if(null != diaStatus){
+            condition = condition.and("diaStatus", diaStatus, MongoOper.IS);
+        }
+        return condition.toMongoQuery();
     }
 }
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 2182ef8..587eade 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
@@ -2,22 +2,18 @@ package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.OptActionEnums;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.operate.web.request.DiagnosisAddRequest;
 import com.lyms.platform.operate.web.result.DiagnosisResult;
 import com.lyms.platform.operate.web.result.HighScoreResult;
 import com.lyms.platform.permission.model.PatientService;
-import com.lyms.platform.pojo.AntExChuModel;
-import com.lyms.platform.pojo.Patients;
-import com.lyms.platform.pojo.SieveApplyOrderModel;
-import com.lyms.platform.pojo.SieveModel;
-import com.lyms.platform.query.AntExChuQuery;
-import com.lyms.platform.query.PatientsQuery;
-import com.lyms.platform.query.SieveApplyOrderQuery;
-import com.lyms.platform.query.SieveQuery;
+import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +45,8 @@ public class DiagnosisFacaed {
     private SieveService sieveService;
     @Autowired
     private AntenatalExaminationService antenatalExaminationService;
+    @Autowired
+    private OperateLogFacade operateLogFacade;
 
 
     /**
@@ -153,4 +151,38 @@ public class DiagnosisFacaed {
     }
 
 
+    /**
+     * 修改或者新增产前诊断申请记录
+     * @param dataresult
+     * @param userId
+     * @return
+     */
+    public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
+        DiagnosisModel DiagnosisModel = dataresult.convertToDataModel();
+        String hospital = autoMatchFacade.getHospitalId(userId);
+        if(StringUtils.isNotEmpty(DiagnosisModel.getId())){//更新数据
+            DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
+            diagnosisQuery.setParentId(DiagnosisModel.getId());
+            List<DiagnosisModel> list = diagnosisService.queryDiagnosis(diagnosisQuery);
+            //更新数据
+            diagnosisService.updateDiagnosisById(DiagnosisModel,DiagnosisModel.getId());
+            //添加记录
+            operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), DiagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断申请修改完成");
+            BaseObjectResponse objectResponse = new BaseObjectResponse();
+            objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+            objectResponse.setData(DiagnosisModel.getId());
+            objectResponse.setErrormsg("成功");
+            return objectResponse;
+        }else{//新增数据
+            DiagnosisModel.setDiaStatus("1");//已申请
+            diagnosisService.addDiagnosis(DiagnosisModel);//插入数据
+            BaseObjectResponse objectResponse = new BaseObjectResponse();
+            objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+            objectResponse.setData(DiagnosisModel.getId());
+            objectResponse.setErrormsg("成功");
+            return objectResponse;
+        }
+
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java
index 9000750..6d3f751 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java
@@ -1,11 +1,316 @@
 package com.lyms.platform.operate.web.request;
 
+import com.lyms.platform.common.base.IBasicRequestConvert;
+import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.pojo.DiagnosisModel;
+
+import java.util.Date;
+
 /**
  * 产前诊断申请请求
  * Created by Administrator on 2018/9/14.
  */
-public class DiagnosisAddRequest {
+public class DiagnosisAddRequest implements IBasicRequestConvert<DiagnosisModel> {
+
+    // 是否分页
+    private String need;
+    // 当前页起始行数
+    private Integer offset = 0;
+    // 页面行数
+    private Integer limit = 15;
+    // 当前页
+    private int page = 1;
+    //产前诊断主键ID
+    private String id;
+    //孕妇ID
+    private String parentId;
+    //孕妇姓名
+    private String name;
+    //身份证号
+    private String cardNo;
+    //联系方式
+    private String phone;
+    //年龄
+    private String age;
+    //孕周
+    private String dueWeek;
+    //预产期
+    private String yChanQi;
+    //诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
+    private String diaProject;
+    //出生日期
+    private String birth;
+    //体重
+    private String weight;
+    //末次月经
+    private String lastMenses;
+    //月经周期开始天数
+    private String mensStartDay;
+    //月经周期结束天数
+    private String mensEndDay;
+    //月经停留开始天数
+    private String mensStopStartDay;
+    //月经停留结束天数
+    private String mensStopEndDay;
+    //标本号
+    private String specimenNo;
+    //采集医生
+    private String collectDocterId;
+    //采集时间
+    private String collectDate;
+    //送检医生
+    private String sendDocterId;
+    //送检日期
+    private String sendDate;
+    //申请医院
+    private String collectHospitalId;
+    //医院ID
+    private String hospitalId;
+
+    public String getNeed() {
+        return need;
+    }
+
+    public void setNeed(String need) {
+        this.need = need;
+    }
+
+    public Integer getOffset() {
+        return offset;
+    }
+
+    public void setOffset(Integer offset) {
+        this.offset = offset;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getDueWeek() {
+        return dueWeek;
+    }
+
+    public void setDueWeek(String dueWeek) {
+        this.dueWeek = dueWeek;
+    }
+
+    public String getyChanQi() {
+        return yChanQi;
+    }
+
+    public void setyChanQi(String yChanQi) {
+        this.yChanQi = yChanQi;
+    }
+
+    public String getDiaProject() {
+        return diaProject;
+    }
+
+    public void setDiaProject(String diaProject) {
+        this.diaProject = diaProject;
+    }
+
+    public String getBirth() {
+        return birth;
+    }
+
+    public void setBirth(String birth) {
+        this.birth = birth;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getLastMenses() {
+        return lastMenses;
+    }
+
+    public void setLastMenses(String lastMenses) {
+        this.lastMenses = lastMenses;
+    }
+
+    public String getMensStartDay() {
+        return mensStartDay;
+    }
+
+    public void setMensStartDay(String mensStartDay) {
+        this.mensStartDay = mensStartDay;
+    }
+
+    public String getMensEndDay() {
+        return mensEndDay;
+    }
+
+    public void setMensEndDay(String mensEndDay) {
+        this.mensEndDay = mensEndDay;
+    }
+
+    public String getMensStopStartDay() {
+        return mensStopStartDay;
+    }
+
+    public void setMensStopStartDay(String mensStopStartDay) {
+        this.mensStopStartDay = mensStopStartDay;
+    }
+
+    public String getMensStopEndDay() {
+        return mensStopEndDay;
+    }
+
+    public void setMensStopEndDay(String mensStopEndDay) {
+        this.mensStopEndDay = mensStopEndDay;
+    }
+
+    public String getSpecimenNo() {
+        return specimenNo;
+    }
+
+    public void setSpecimenNo(String specimenNo) {
+        this.specimenNo = specimenNo;
+    }
+
+    public String getCollectDocterId() {
+        return collectDocterId;
+    }
+
+    public void setCollectDocterId(String collectDocterId) {
+        this.collectDocterId = collectDocterId;
+    }
+
+    public String getCollectDate() {
+        return collectDate;
+    }
+
+    public void setCollectDate(String collectDate) {
+        this.collectDate = collectDate;
+    }
+
+    public String getSendDocterId() {
+        return sendDocterId;
+    }
+
+    public void setSendDocterId(String sendDocterId) {
+        this.sendDocterId = sendDocterId;
+    }
+
+    public String getSendDate() {
+        return sendDate;
+    }
+
+    public void setSendDate(String sendDate) {
+        this.sendDate = sendDate;
+    }
+
+    public String getCollectHospitalId() {
+        return collectHospitalId;
+    }
+
+    public void setCollectHospitalId(String collectHospitalId) {
+        this.collectHospitalId = collectHospitalId;
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
 
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
 
+    @Override
+    public DiagnosisModel convertToDataModel(){
+        DiagnosisModel diagnosisModel = new DiagnosisModel();
+        diagnosisModel.setId(id);
+        diagnosisModel.setHospitalId(hospitalId);
+        diagnosisModel.setParentId(parentId);
+        diagnosisModel.setName(name);
+        diagnosisModel.setIdCard(cardNo);
+        diagnosisModel.setAge(age);
+        diagnosisModel.setDueWeek(dueWeek);
+        diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi));
+        diagnosisModel.setPhone(phone);
+        diagnosisModel.setDiaProject(diaProject);
+        diagnosisModel.setBirth(DateUtil.paseYMDH(birth));
+        diagnosisModel.setWeight(weight);
+        diagnosisModel.setLastMenses(DateUtil.parseYMD(lastMenses));
+        diagnosisModel.setMensStartDay(mensStartDay);
+        diagnosisModel.setMensEndDay(mensEndDay);
+        diagnosisModel.setMensStopStartDay(mensStopStartDay);
+        diagnosisModel.setMensStopEndDay(mensStopEndDay);
+        diagnosisModel.setSpecimenNo(specimenNo);
+        diagnosisModel.setCollectDocterId(collectDocterId);
+        diagnosisModel.setCollectDate(DateUtil.parseYMD(collectDate));
+        diagnosisModel.setSendDocterId(sendDocterId);
+        diagnosisModel.setSendDate(DateUtil.parseYMD(sendDate));
+        diagnosisModel.setCollectHospitalId(collectHospitalId);
+        diagnosisModel.setCreated(new Date());
 
+        return diagnosisModel;
+    }
 }