options: 增加疾病治愈率统计方式

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20241028072205-d586542d9487
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20241029012622-50585ae73c7d
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241028073848-407d15a8f011
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eko/gocache v1.1.0

go.sum

@@ -40,6 +40,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20241028071126-73c3c42b5159 h1:xcAqrT40
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241028071126-73c3c42b5159/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241028072205-d586542d9487 h1:xeD7qGaA1HyRXc5VvzQmeIQj040NuZ5TfVRx4NUg16Q=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241028072205-d586542d9487/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20241029012622-50585ae73c7d h1:VoZSuWA2Q21maenUATF3fBiKIqigkJ31vV+kRrzjjGA=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20241029012622-50585ae73c7d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241028073848-407d15a8f011 h1:jiabQDYcT5PjqyLh57xecf7FpADdWR88+JCrdvBpqfM=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241028073848-407d15a8f011/go.mod h1:Fk4GYI/v0IK3XFrm1Gn+VkgCz5Y7mfswD5hsTJYOG6A=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

model/event_cow_treatment.go

@@ -54,7 +54,7 @@ func (e EventCowTreatmentSlice) ToPB(eventCowDiseaseList []*EventCowDisease) []*
 	res := make([]*pasturePb.EventCowTreatment, len(e))
 	for i, v := range e {
 		prescriptionDetail := make([]*pasturePb.TreatmentDrugs, 0)
-		if v.PrescriptionDetail == "" {
+		if v.PrescriptionDetail != "" {
 			err := json.Unmarshal([]byte(v.PrescriptionDetail), &prescriptionDetail)
 			if err != nil {
 				zaplog.Error("EventCowTreatmentSlice", zap.Any("err", err))

module/backend/analysis_other.go

@@ -78,9 +78,9 @@ func (s *StoreEntry) CalvingReport(ctx context.Context, req *pasturePb.CalvingRe
 
 	if req.AnalysisMethod > 0 {
 		switch req.AnalysisMethod {
-		case pasturePb.CalvingAnalysisMethod_months:
+		case pasturePb.CalvingAnalysisMethod_Months:
 			pref1.Group("statistic_method").Order("statistic_method")
-		case pasturePb.CalvingAnalysisMethod_cowKind:
+		case pasturePb.CalvingAnalysisMethod_CowKind:
 			pref1.Group("cow_kind").Order("cow_kind")
 		}
 	}
@@ -103,9 +103,9 @@ func (s *StoreEntry) CalvingReport(ctx context.Context, req *pasturePb.CalvingRe
 
 	if req.AnalysisMethod > 0 {
 		switch req.AnalysisMethod {
-		case pasturePb.CalvingAnalysisMethod_months:
+		case pasturePb.CalvingAnalysisMethod_Months:
 			pref2.Group("statistic_method").Order("statistic_method")
-		case pasturePb.CalvingAnalysisMethod_cowKind:
+		case pasturePb.CalvingAnalysisMethod_CowKind:
 			pref2.Group("cow_kind").Order("cow_kind")
 		}
 	}
@@ -132,7 +132,7 @@ func (s *StoreEntry) CalvingReport(ctx context.Context, req *pasturePb.CalvingRe
 
 	cowKindMap := s.CowKindMap()
 	for _, v := range eventCalving1 {
-		if req.AnalysisMethod == pasturePb.CalvingAnalysisMethod_cowKind {
+		if req.AnalysisMethod == pasturePb.CalvingAnalysisMethod_CowKind {
 			v.StatisticMethod = cowKindMap[v.CowKind]
 		}
 		if v.TotalCount > 0 {

module/backend/config_data_other.go

@@ -526,11 +526,11 @@ func (s *StoreEntry) CalvingAnalysisMethodEnumList(isAll string) []*pasturePb.Co
 		})
 	}
 	configOptions = append(configOptions, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CalvingAnalysisMethod_months),
+		Value:    int32(pasturePb.CalvingAnalysisMethod_Months),
 		Label:    "按月份统计",
 		Disabled: true,
 	}, &pasturePb.ConfigOptionsList{
-		Value:    int32(pasturePb.CalvingAnalysisMethod_cowKind),
+		Value:    int32(pasturePb.CalvingAnalysisMethod_CowKind),
 		Label:    "按照品种统计",
 		Disabled: true,
 	})
@@ -565,3 +565,36 @@ func (s *StoreEntry) LactEnumList(isAll string) []*pasturePb.ConfigOptionsList {
 	})
 	return configOptions
 }
+
+func (s *StoreEntry) DiseaseAnalysisMethodEnumList(isAll string) []*pasturePb.ConfigOptionsList {
+	configOptions := make([]*pasturePb.ConfigOptionsList, 0)
+	if isAll == model.IsAllYes {
+		configOptions = append(configOptions, &pasturePb.ConfigOptionsList{
+			Value:    int32(pasturePb.DiseaseAnalysisMethod_Invalid),
+			Label:    "全部",
+			Disabled: true,
+		})
+	}
+	configOptions = append(configOptions, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.DiseaseAnalysisMethod_Months),
+		Label:    "按月份",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.DiseaseAnalysisMethod_Disease_Category),
+		Label:    "疾病分类",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.DiseaseAnalysisMethod_Disease),
+		Label:    "疾病名称",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.DiseaseAnalysisMethod_Operator),
+		Label:    "兽医",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.DiseaseAnalysisMethod_Prescription),
+		Label:    "处方",
+		Disabled: true,
+	})
+	return configOptions
+}

module/backend/enum_options.go

@@ -185,6 +185,7 @@ func (s *StoreEntry) SystemBaseConfigOptions(ctx context.Context, optionsName, i
 		"calendarType":           CalendarTypeEnumList,
 		"calvingAnalysisMethod":  s.CalvingAnalysisMethodEnumList,
 		"lact":                   s.LactEnumList,
+		"diseaseAnalysisMethod":  s.DiseaseAnalysisMethodEnumList,
 	}
 
 	getConfigFunc, ok := getConfigFuncMap[optionsName]