diff --git a/inventory-dao/src/main/resources/mapper/RkScoreTypeMapper.xml b/inventory-dao/src/main/resources/mapper/RkScoreTypeMapper.xml
index 666d3cf..eba9a22 100644
--- a/inventory-dao/src/main/resources/mapper/RkScoreTypeMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/RkScoreTypeMapper.xml
@@ -74,7 +74,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    type_id, name, parent_id, sort_id, source, modified, created, modify_time, create_time
+    type_id, name, parent_id, sort_id, source,score_type, modified, created, modify_time, create_time
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
diff --git a/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java b/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
index ea015d1..49092c7 100644
--- a/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
+++ b/inventory-ent/src/main/java/com/rzyc/controller/RiskController.java
@@ -233,6 +233,9 @@ public class RiskController extends BaseController {
                     }
                 }
 
+
+//                Integer ambientScore =
+
                 //1.生产经营单位周边存在重要场所（如学校、医院、养老院等）、重要目标（如党政机关、军事管理区、文物保护单位，主要道路桥梁等），每处扣5分；
                 if (rkScoreType.getSource() == 4){
                     AtomicReference<Integer> score = new AtomicReference<>(0);
@@ -344,12 +347,19 @@ public class RiskController extends BaseController {
         List<RkEnterpriseScore> rkEnterpriseScores = JSONArray.parseArray(rkEntSensitiveDto.getRkSensitive(), RkEnterpriseScore.class);
         AtomicReference<Integer> score = new AtomicReference<>(80);
         AtomicReference<Integer> securityScore = new AtomicReference<>(20);
+        AtomicReference<Integer> ambientScore = new AtomicReference<>(20);
         if (rkEnterpriseScores.size()>0){
             //先删除所有
             rkEnterpriseScoreMapper.deleteByEnterpriseId(enterpriseId);
             //添加
             rkEnterpriseScores.forEach(rkEnterpriseScore -> {
                 rkEnterpriseScore.setScoreId(RandomNumber.getUUid());
+                RkScoreType rkScoreType = rkScoreTypeMapper.selectByPrimaryKey(rkEnterpriseScore.getTypeId());
+                if(null != rkScoreType){
+                    rkEnterpriseScore.setParentId(rkScoreType.getParentId());
+                    rkEnterpriseScore.setScoreType(rkScoreType.getScoreType());
+                }
+//
                 if (rkEnterpriseScore.getScore() != null){
                     if(rkEnterpriseScore.getParentId().equals(SAFETY_ACCIDENTS) || rkEnterpriseScore.getParentId().equals(STANDARDIZATION_OF_WORK_SAFETY)  ){
                         if (rkEnterpriseScore.getScoreType() == 1){
@@ -357,7 +367,14 @@ public class RiskController extends BaseController {
                         }else{
                             securityScore.set(securityScore.get() - rkEnterpriseScore.getScore());
                         }
-                    }else{
+                    }else if(rkEnterpriseScore.getParentId().equals(HIGH_SENSITIVE_PLACES) || rkEnterpriseScore.getParentId().equals(KEY_OBJECTIVES) || rkEnterpriseScore.getParentId().equals(DENSELY_POPULATED_PLACES)){
+                        //周变情况
+                        if (rkEnterpriseScore.getScoreType() == 1){
+                            ambientScore.set(rkEnterpriseScore.getScore()+ambientScore.get());
+                        }else{
+                            ambientScore.set(ambientScore.get() - rkEnterpriseScore.getScore());
+                        }
+                    } else{
                         if (rkEnterpriseScore.getScoreType() == 1){
                             score.set(rkEnterpriseScore.getScore()+score.get());
                         }else{
@@ -378,8 +395,14 @@ public class RiskController extends BaseController {
             }else if (securityScore.get() <0){
                 securityScore.set(0);
             }
+            if (ambientScore.get()>20){
+                ambientScore.set(20);
+            }else if (ambientScore.get() <0){
+                ambientScore.set(0);
+            }
 
-            score.set(score.get()+securityScore.get());
+            score.set(score.get()+securityScore.get()+ambientScore.get());
+            System.out.println("score ----> "+score);
 
             //保存诊断列表
             this.updateOrAddDiagnosis(score.get(),enterpriseId,rkEntSensitiveDto.getCategory());