diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 880d929..5cabc25 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -346,7 +346,7 @@ public class BookbuildingFacade {
             }
         }
 
-         Patients patient = getPatientsData(yunRequest);
+        Patients patient = getPatientsData(yunRequest);
         patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
 
         patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
@@ -382,13 +382,20 @@ public class BookbuildingFacade {
         //生成条形码
         getNumberCode(patient);
         getTrackHospital(patient);
+
+        String riskFactorId = yunRequest.getRiskFactorId();
+        if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){
+            patient.setRiskFactorId(Arrays.asList(riskFactorId.split(",")));
+        }
+        patient.setRiskLevelId(yunRequest.getLevel());
+
         //孕妇档案
         Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
 
         //添加追访信息
         addTrackDownInfo(userId, p);
 
-        operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档");
+        operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), null, OptActionEnums.ADD.getId(), "孕妇建档");
         /** 建档核验模块 **/
         //建档成功后保存核验结果
         if(StringUtils.isNotEmpty(p.getId()) && null != yunRequest.getVerifyInfo()){
@@ -1820,7 +1827,7 @@ public class BookbuildingFacade {
                     patients1.getHareaRegisterId(), patients1.getHstreetRegisterId(), patients1.getHaddressRegister(),
                     basicConfigService);
             map.put("husbandRegister",husbandRegister ); //丈夫户籍地址
-          //  院内信息
+            //  院内信息
             map.put("lastMenses", DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经
             map.put("mensStopStartDay",patients1.getMensStopStartDay());//月经停留开始天数
             map.put("mensStopEndDay",patients1.getMensStopEndDay());//月经停留结束天数
@@ -1965,6 +1972,12 @@ public class BookbuildingFacade {
 
             patient.setHlevelTypeId("");
             patient.setHusbandBirth(null);
+
+            patient.setRiskLevelId(yunRequest.getLevel());
+            String riskFactorId = yunRequest.getRiskFactorId();
+            if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){
+                patient.setRiskFactorId(Arrays.asList(riskFactorId.split(",")));
+            }
             if (StringUtils.isNotEmpty(yunRequest.getId()))
             {
                 patientsService.updatePatientHusbandBirth(yunRequest.getId(),null);
@@ -3539,8 +3552,8 @@ public class BookbuildingFacade {
         AggregationOperation queryParam = Aggregation.match(query.getCriteria());
         AggregationOperation group = Aggregation.group("townOrgId","recommend");
         AggregationOperation month = project().
-                        andExpression("townOrgId").as("townOrgId").
-                        andExpression("recommend").as("recommend");
+                andExpression("townOrgId").as("townOrgId").
+                andExpression("recommend").as("recommend");
         Aggregation  aggregation= Aggregation.newAggregation(queryParam,month, group);
 
         final AggregationResults<Patients> lyms_patient = mongoTemplate.aggregate(aggregation, "lyms_patient", Patients.class);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index b7aed8f..2beb6a4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -2745,6 +2745,16 @@ public class PatientFacade extends BaseServiceImpl {
                 PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel();
                 BeanUtils.copy(patients, patientManagerQueryModel);
 
+                patientManagerQueryModel.setLevel(patients.getRiskLevelId());
+                String join = org.apache.commons.lang.StringUtils.join( patients.getRiskFactorId(), ",");
+                patientManagerQueryModel.setRiskFactorId(join);
+                try {
+                    String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
+                    patientManagerQueryModel.setCouponCommunity(hname);
+                } catch (Exception e) {
+                    patientManagerQueryModel.setCouponCommunity("");
+                }
+
                 patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩");
                 patientManagerQueryModel.setYyzyfmHospitalName(
                         (patients.getYyzyfmHospitalId() != null && "-1".equals(patients.getYyzyfmHospitalId())) ? "其他" :  couponMapper.getHospitalName(patients.getYyzyfmHospitalId()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
index 8bb8985..bb51c47 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
@@ -86,6 +86,27 @@ public class YunBookbuildingAddRequest {
     //归属地id
     private String addressId;
 
+    //高危因素
+    private String riskFactorId;
+    private String level;
+
+
+    public String getRiskFactorId() {
+        return riskFactorId;
+    }
+
+    public void setRiskFactorId(String riskFactorId) {
+        this.riskFactorId = riskFactorId;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
     public String getBooksuifangDoctor() {
         return booksuifangDoctor;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
index 10c239b..f9399eb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
@@ -114,6 +114,37 @@ public class PatientManagerQueryModel {
     //随访医生
     private String booksuifangDoctor;
 
+    //高危因素
+    private String riskFactorId;
+    //高危等级
+    private String level;
+    //领劵社区
+    private String couponCommunity;
+
+    public String getCouponCommunity() {
+        return couponCommunity;
+    }
+
+    public void setCouponCommunity(String couponCommunity) {
+        this.couponCommunity = couponCommunity;
+    }
+
+    public String getRiskFactorId() {
+        return riskFactorId;
+    }
+
+    public void setRiskFactorId(String riskFactorId) {
+        this.riskFactorId = riskFactorId;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
     public String getBooksuifangDoctor() {
         return booksuifangDoctor;
     }