Merge branch 'master' of http://124.70.43.205:3000/wangchangsheng/evaluation

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -1008,6 +1008,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 				info.setId(entry.getValue().toString());
 				String quantified = valueMap.get(entry.getKey().replace("ID_","IS_LH_")).toString();
+				scoreid = entry.getValue().toString();
 				if(null != valueMap.get(entry.getKey().replace("ID_", ""))) {
 
 					//加分 扣分 加扣分原因
@@ -1028,7 +1029,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 							//得分
 							if (entry.getKey().endsWith("_DF") || entry.getKey().endsWith("_DF2") || entry.getKey().endsWith("_JHDF")) {
 								score = score + info.getQuantifiedValue();
-								scoreid = entry.getValue().toString();
+
 							}
 
 							//加分 扣分