提交

customerdata/src/util.go

@@ -57,7 +57,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw                   //记录原值
+						cr.CsVal = tmp_nkw //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -109,7 +109,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw                   //记录原值
+					cr.CsVal = tmp_aw //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -560,6 +560,9 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 					}
 				}
 			}
+			if index == 1 {
+				GetWinnerType(qu.ObjToString(tmp["s_winner"]), tmp)
+			}
 			if len(indexdata) > 0 {
 				for _, v := range indexdata {
 					MgoSaveCache <- v
@@ -950,29 +953,33 @@ func Sort_year_report(year_report primitive.A) map[string]interface{} {
 
 func GetWinnerType(s_winner string, v map[string]interface{}) {
 	isMatch := false
-	for _, vs := range Sysconfig.DisPackageConfig {
-		vvs := vs.(map[string]interface{})
-		keyWord := qu.ObjToString(vvs["keyWord"])
-		exclued := qu.ObjToString(vvs["exclued"])
-		name := qu.ObjToString(vvs["name"])
-		for _, key := range strings.Split(keyWord, ",") {
-			if strings.Contains(s_winner, key) {
-				isMatch = true
-				if exclued != "" {
-					for _, keys := range strings.Split(exclued, ",") {
-						if strings.Contains(s_winner, keys) {
-							isMatch = false
+	if s_winner != "" {
+		for _, vs := range Sysconfig.DisPackageConfig {
+			vvs := vs.(map[string]interface{})
+			keyWord := qu.ObjToString(vvs["keyWord"])
+			exclued := qu.ObjToString(vvs["exclued"])
+			name := qu.ObjToString(vvs["name"])
+			for _, key := range strings.Split(keyWord, ",") {
+				if strings.Contains(s_winner, key) {
+					isMatch = true
+					if exclued != "" {
+						for _, keys := range strings.Split(exclued, ",") {
+							if strings.Contains(s_winner, keys) {
+								isMatch = false
+							}
 						}
 					}
 				}
 			}
+			if isMatch {
+				v["winner_type"] = name
+				break
+			}
 		}
-		if isMatch {
-			v["winner_type"] = name
-			break
+		if !isMatch {
+			v["winner_type"] = "集成商"
 		}
-	}
-	if !isMatch {
-		v["winner_type"] = "集成商"
+	} else {
+		v["winner_type"] = ""
 	}
 }