diff --git a/api/admin/dutyassess/dutyhandle.go b/api/admin/dutyassess/dutyhandle.go
index 263cfb3..d7abe41 100644
--- a/api/admin/dutyassess/dutyhandle.go
+++ b/api/admin/dutyassess/dutyhandle.go
@@ -11,6 +11,7 @@ import (
 	"gin_server_admin/global"
 	"gin_server_admin/model/assessmentmodel"
 	"gin_server_admin/model/common/response"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -1665,7 +1666,7 @@ func (d *DutyAssessApi) NewGerDerpatTarList(c *gin.Context) {
 */
 func GetTargetGroup(group, dimensionId, departID string) (contAry []DepartTargetList) {
 	var rationId []int64
-	gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("et_id").Where("`et_type` = 2 AND `et_state` = 1 AND `et_dimension` = ?", dimensionId)
+	gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("et_id").Where("`et_state` = 1 AND `et_dimension` = ?", dimensionId)
 	if departID != "" {
 		// sqlOrStr := fmt.Sprintf("FIND_IN_SET(%v,`et_relevant_departments`)", departID)
 		// sqlOrStr = fmt.Sprintf("`et_share` = 1 OR (`et_share` = 2 AND (%v))", sqlOrStr)
diff --git a/api/reply/quan/enter.go b/api/reply/quan/enter.go
index 12253c2..d7a467f 100644
--- a/api/reply/quan/enter.go
+++ b/api/reply/quan/enter.go
@@ -3,6 +3,7 @@ package quan
 import (
 	"gin_server_admin/commonus"
 	"gin_server_admin/model/common/response"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -36,6 +37,7 @@ type RationLogList struct {
 	Enclosure     []string `json:"enclosure"`     //附件
 	ScoringMethod int      `json:"scoringmethod"` //计分方式（1：自动；2：手动）"`
 	ScoringScore  float64  `json:"scoringscore"`  //手动分"`
+	ReachScore    string   `json:"reachscore"`    //手动分"`
 	// PlanVersionNumber string   `json:"planversionnumber"` //版本号
 	Addtime string `json:"time"`  //检查时间
 	Cycle   int    `json:"cycle"` //1：班；2：天；3：周；4：月；5：季度；6：年；7：半年
diff --git a/api/reply/quan/ration.go b/api/reply/quan/ration.go
index 5d40241..90d8502 100644
--- a/api/reply/quan/ration.go
+++ b/api/reply/quan/ration.go
@@ -519,7 +519,12 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) {
 				flowDataLog.Enclosure = strings.Join(v.Enclosure, ",")
 				if v.ScoringMethod == 2 {
 					flowDataLog.ScoringMethod = 2
-					flowDataLog.ScoringScore = v.ScoringScore * 100
+					// flowDataLog.ScoringScore = v.ScoringScore * 100
+
+					sdf, sdfErr := strconv.ParseFloat(v.ReachScore, 10)
+					flowDataLog.ScoringScore = sdf * 100
+					fmt.Printf("计分计算---->%v---->%v---->%v\n", sdf, sdfErr, flowDataLog.ScoringScore)
+
 				} else {
 					flowDataLog.ScoringMethod = 1
 					flowDataLog.ScoringScore = 0
@@ -573,7 +578,9 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) {
 			// fmt.Printf("v.ScoringMethod ----->%v\n", v.ScoringMethod)
 			if v.ScoringMethod == 2 {
 				flowDataLog.ScoringMethod = 2
-				flowDataLog.ScoringScore = v.ScoringScore * 100
+				// flowDataLog.ScoringScore = v.ScoringScore * 100
+				shoudongFeng, _ := strconv.ParseFloat(v.ReachScore, 10)
+				flowDataLog.ScoringScore = shoudongFeng * 100
 			} else {
 				flowDataLog.ScoringMethod = 1
 				flowDataLog.ScoringScore = 0
@@ -621,11 +628,14 @@ func (a *ApiGroup) SendRationFlow(c *gin.Context) {
 		response.Result(0, yiTianJianMingc, "您的数据已经提交！请不要重复提交！", c)
 		return
 	}
-	// jsonCont, _ := json.Marshal(flowDataLogAry)
-	// fmt.Printf("flowDataLogAry=>%v\n", string(jsonCont))
-	// return
+
 	addFlowLogErr := gromDb.Create(&flowLog).Error
 	addFlowLogDataErr := gromDb.Create(&flowDataLogAry).Error
+
+	// jsonCont, _ := json.Marshal(flowDataLogAry)
+	// jsonContss, _ := json.Marshal(requestData)
+	// fmt.Printf("flowDataLogAry=>------------------>%v------------------>%v\n", string(jsonContss), string(jsonCont))
+	// return
 	if addFlowLogErr == nil && addFlowLogDataErr == nil {
 		affairDbErr := gromDb.Commit().Error
 		if affairDbErr == nil {
diff --git a/api/statistics/quantification/summary_details.go b/api/statistics/quantification/summary_details.go
index 713ab75..b3306de 100644
--- a/api/statistics/quantification/summary_details.go
+++ b/api/statistics/quantification/summary_details.go
@@ -306,18 +306,18 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 			zeroPrize = v.Zeroprize / 100
 			CappingVal = v.Capping / 100
 
-			// fmt.Printf("%v----全奖--1-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+			fmt.Printf("%v----全奖--1-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 
 			if allPrize == 0 && zeroPrize == 0 { //全奖值与零奖值都为0 那么达成率 100 和实际得分是 指标分
 				achievement = 100
 				scoreVal = targetScore
-				// fmt.Printf("%v----全奖--2-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+				fmt.Printf("%v----全奖--2-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 			} else {
 				if allPrize > zeroPrize { //如果全奖值大于零奖值 执行一下操作
 					if settlementScore <= zeroPrize { //实际结算值小于零奖值 那么达成率和实际得分都是0
 						scoreVal = 0
 						achievement = 0
-						// fmt.Printf("%v----全奖--3-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+						fmt.Printf("%v----全奖--3-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 					} else { //实际结算值在全奖值 与 零奖值之间
 						chuShu := settlementScore - float64(zeroPrize)
 						beiChuShu := float64(allPrize) - float64(zeroPrize)
@@ -326,25 +326,25 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 							if achievement <= 0 {
 								achievement = 0
 								scoreVal = 0
-								// fmt.Printf("%v----全奖--4-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+								fmt.Printf("%v----全奖--4-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 							} else {
 								if achievement*100 >= CappingVal {
 									if CappingVal > 0 {
 										scoreVal = (CappingVal / 100) * targetScore
-										// fmt.Printf("%v----全奖--6-1->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+										fmt.Printf("%v----全奖--6-1->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 									} else {
 										scoreVal = targetScore
-										// fmt.Printf("%v----全奖--6-2->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+										fmt.Printf("%v----全奖--6-2->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 									}
 
 								} else {
 									scoreVal = (chuShu / beiChuShu) * targetScore
-									// fmt.Printf("%v----全奖--6-3->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+									fmt.Printf("%v----全奖--6-3->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 								}
 
 							}
 							achievement = commonus.DecimalEs(achievement*100, 4)
-							// fmt.Printf("%v----全奖--6-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+							fmt.Printf("%v----全奖--6-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 						} else {
 							achievement = 0
 							scoreVal = 0
@@ -355,7 +355,7 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 					if settlementScore >= zeroPrize { //实际结算值大于零奖值 那么达成率和实际得分都是0
 						achievement = 0
 						scoreVal = 0
-						// fmt.Printf("%v----全奖--7-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+						fmt.Printf("%v----全奖--7-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 					} else {
 						chuShu := settlementScore - float64(zeroPrize)
 						beiChuShu := float64(allPrize) - float64(zeroPrize)
@@ -365,24 +365,24 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 								//如果在全奖值大于零件值的情况下出现达成率为0或负数，则达成率和实际得分都是0
 								achievement = 0
 								scoreVal = 0
-								// fmt.Printf("%v----全奖--8-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+								fmt.Printf("%v----全奖--8-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 							} else {
 								if achievement*100 >= CappingVal {
 									scoreVal = (CappingVal / 100) * targetScore
-									// fmt.Printf("%v----全奖--13-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+									fmt.Printf("%v----全奖--13-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 								} else {
 									scoreVal = (chuShu / beiChuShu) * targetScore
-									// fmt.Printf("%v----全奖--14-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+									fmt.Printf("%v----全奖--14-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 								}
-								// fmt.Printf("%v----全奖--9-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+								fmt.Printf("%v----全奖--9-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 							}
 							achievement = commonus.DecimalEs(achievement*100, 4)
-							// fmt.Printf("%v----全奖--10-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+							fmt.Printf("%v----全奖--10-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 						} else {
 							//被除数为0时 那么达成率和实际得分都是0
 							achievement = 0
 							scoreVal = 0
-							// fmt.Printf("%v----全奖--11-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+							fmt.Printf("%v----全奖--11-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 						}
 					}
 				}
@@ -400,7 +400,7 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 	zeroPrize = commonus.Decimal(zeroPrize)
 	CappingVal = commonus.Decimal(CappingVal)
 	achievement = commonus.DecimalEs(achievement, 4)
-	// fmt.Printf("%v----全奖--12-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
+	fmt.Printf("%v----全奖--12-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 	return
 }
 
diff --git a/gin_server_admin b/gin_server_admin
index 9c5568c..b9348c1 100644
Binary files a/gin_server_admin and b/gin_server_admin differ