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 87ccb7f..4a6830f 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
@@ -1,19 +1,19 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.ApplyOrderService;
-import com.lyms.platform.biz.service.DiagnosisService;
-import com.lyms.platform.biz.service.PatientsService;
-import com.lyms.platform.biz.service.SieveService;
+import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 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.JsonUtil;
 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;
@@ -45,6 +45,8 @@ public class DiagnosisFacaed {
     private ApplyOrderService applyOrderService;
     @Autowired
     private SieveService sieveService;
+    @Autowired
+    private AntenatalExaminationService antenatalExaminationService;
 
 
     /**
@@ -126,13 +128,21 @@ public class DiagnosisFacaed {
             }else{
                 diagnosisResult.setIsCqSieve("0");//未筛查
             }
-
-
+            diagnosisResult.convertToResult(pat);
+            diagnosisResult.setRiskFactor(highScoreResult.getHighRisk());
+            diagnosisResult.setRiskScore(highScoreResult.getScoreStr());
+            AntExChuQuery antExChuQuery = new AntExChuQuery();
+            antExChuQuery.setParentId(pat.getId());
+            antExChuQuery.setYn(YnEnums.YES.getId());
+
+            List<AntExChuModel> aList = antenatalExaminationService.queryAntExChu(antExChuQuery);
+            if (CollectionUtils.isNotEmpty(aList)) {
+                AntExChuModel chuModel = aList.get(0);
+                diagnosisResult.setWeight(chuModel.getYqWeight());
+            }
 
         }
-
-
-        return null;
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(diagnosisResult);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/diagnosisResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/diagnosisResult.java
index 6bb4f2b..06d002d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/diagnosisResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/diagnosisResult.java
@@ -1,5 +1,10 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.pojo.Patients;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -224,7 +229,28 @@ public class DiagnosisResult {
         this.ztfeText = ztfeText;
     }
 
-    public DiagnosisResult con(){
+    public DiagnosisResult convertToResult(Patients patient){
+        setName(patient.getUsername());
+        try{
+            if (null != patient.getBirth()) {
+                setAge(DateUtil.getAge(patient.getBirth()));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if (null != patient.getDueDate()) {
+            setyChanQi(DateUtil.getyyyy_MM_dd(patient.getDueDate()));
+        }
+        if (null != patient.getLastMenses()) {
+            int days = DateUtil.daysBetween(patient.getLastMenses(), new Date());
+            this.dueWeek = StringUtils.dueWeek(days);
+
+            setLastMenses(DateUtil.getyyyy_MM_dd(patient.getLastMenses()));
+        }
+        setMensStartDay(patient.getMensStartDay());
+        setMensEndDay(patient.getMensEndDay());
+        setMensStopStartDay(patient.getMensStopStartDay());
+        setMensStopEndDay(patient.getMensStopEndDay());
 
         return this;
     }