update

dsBigData/Business/School/SchoolController/SchoolController.go

@@ -477,6 +477,23 @@ func GetEduAssistCountByCity(c *gin.Context) {
 		eduAssistCountArr = append(eduAssistCountArr, eduAssistCount)
 	}
 
+	if areaType == "1" {
+		cityDirectlyCount, err := SchoolService.GetCityDirectlyEduAssistCount(cityCode)
+		if err != nil {
+			c.JSON(http.StatusOK, Model.Res{
+				Success: false,
+				Message: err.Error(),
+			})
+			return
+		}
+
+		var eduAssistCount SchoolModel.EduAssistCount
+		eduAssistCount.AreaCode = cityCode
+		eduAssistCount.AreaName = "市直属"
+		eduAssistCount.Count = cityDirectlyCount
+		eduAssistCountArr = append(eduAssistCountArr, eduAssistCount)
+	}
+
 	c.JSON(http.StatusOK, Model.Res{
 		Success: true,
 		List:    eduAssistCountArr,

dsBigData/Business/School/SchoolDao/SchoolDao.go

@@ -567,5 +567,29 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) {
 	}
 
 	return int(result.TotalHits()), nil
+}
+
+/**
+功能：根据市编码获取教辅单位数量
+*/
+func GetCityDirectlyEduAssistCount(cityCode string) (int, error) {
+	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
+	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
+	bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
+	districtCodeTerm := elastic.NewTermQuery("district_code", cityCode)
+	orgTypeTerm := elastic.NewTermQuery("org_type", "3")
+
+	boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
 
+	result, err := esClient.Search().
+		Index("org_school").
+		Query(boolQuery).
+		Size(0).
+		Do(CTX)
+
+	if err != nil {
+		return 0, err
+	}
+
+	return int(result.TotalHits()), nil
 }

dsBigData/Business/School/SchoolService/SchoolService.go

@@ -87,3 +87,8 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) {
 	count, err := SchoolDao.GetCityDirectlySchoolCount(cityCode)
 	return count, err
 }
+
+func GetCityDirectlyEduAssistCount(cityCode string) (int, error) {
+	count, err := SchoolDao.GetCityDirectlyEduAssistCount(cityCode)
+	return count, err
+}

dsBigData/Business/Student/StudentDao/StudentDao.go

@@ -204,7 +204,7 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St
 	resCount := gjson.Get(resStr, "rxnf.buckets.#")
 	for i := 0; i < int(resCount.Num); i++ {
 		var studentCountRxnf StudentModel.StudentCountRxnf
-		studentCountRxnf.Rxnf = CommonUtil.ConverFloat64ToString(gjson.Get(resStr, "rxnf.buckets."+CommonUtil.ConvertIntToString(i)+".key").Num)
+		studentCountRxnf.Rxnf = CommonUtil.ConverFloat64ToString(gjson.Get(resStr, "rxnf.buckets."+CommonUtil.ConvertIntToString(i)+".key").Num) + "级"
 		studentCountRxnf.Count = int(gjson.Get(resStr, "rxnf.buckets."+CommonUtil.ConvertIntToString(i)+".doc_count").Num)
 
 		studentCountRxnfArr = append(studentCountRxnfArr, studentCountRxnf)