Merge branch 'xt_statistics_branch' of http://git.shengws.com/csx/XT_New into xt_statistics_branch

controllers/inspection_api_controller.go

@@ -124,10 +124,10 @@ func (c *InspectionApiController) CreatePatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
@@ -226,13 +226,11 @@ func (c *InspectionApiController) CreatePatientInspection() {
 }
 
 func (c *InspectionApiController) EditPatientInspection() {
-	fmt.Println("触发了没有---------------------------------------")
 	patient, _ := c.GetInt64("patient", 0)
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
-	dates := c.GetString("dates")
-	projectid := c.GetString("projectid")
-	fmt.Println("日期---", dates)
-	fmt.Println("projectid", projectid)
+	// dates := c.GetString("dates")
+	// projectid := c.GetString("projectid")
+
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -253,23 +251,31 @@ func (c *InspectionApiController) EditPatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
 		return
 	}
 
+	oldTime, olderr := time.ParseInLocation(timeLayout, from.OldInspectDate, loc)
+	if olderr != nil {
+		utils.ErrorLog(olderr.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
+		return
+	}
+
 	if len(from.FormItem) == 0 {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "未填写项目")
 		return
 	}
 
 	date := theTime.Unix()
-	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, date, from.ProjectId)
+	oldDate := oldTime.Unix()
+	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, oldDate, from.ProjectId)
 	if err != nil {
 		utils.ErrorLog("%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -306,10 +312,10 @@ func (c *InspectionApiController) EditPatientInspection() {
 			inspection.CreatedTime = time.Now().Unix()
 			inspection.UpdatedTime = time.Now().Unix()
 			addinsp = append(addinsp, inspection)
-		} else if _, exi := inspMap[item.ID]; exi {
-			fmt.Println("2222222222")
+		} else {
 			inspection := *inspMap[item.ID]
 			inspection.InspectValue = item.Value
+			inspection.InspectDate = date
 			inspection.UpdatedTime = time.Now().Unix()
 			editinsp = append(editinsp, inspection)
 			noMap = append(noMap, item.ID)
@@ -373,15 +379,15 @@ func (c *InspectionApiController) DeletePatientInspection() {
 	patient, _ := c.GetInt64("patient", 0)
 	ProjectId, _ := c.GetInt64("project_id", 0)
 	InspectDate := c.GetString("date")
-	if patient <= 0 || ProjectId <= 0 || len(InspectDate) != 10 {
+	if patient <= 0 || ProjectId <= 0 || len(InspectDate) < 10 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1012,6 +1012,9 @@ func (this *CommonApiController) GetMonthProjectList() {
 
 	febStart := this.GetString("febStart")
 	fmt.Println("二月始", febStart)
+	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
+	febStartStrStrUnix := febStartStr.Unix()
+	fmt.Println("二月使", febStartStrStrUnix)
 	febEnd := this.GetString("febEnd")
 	fmt.Println("二月末", febEnd)
 	febEndStr := febEnd + " 23:59:59"
@@ -1021,6 +1024,9 @@ func (this *CommonApiController) GetMonthProjectList() {
 
 	marchStart := this.GetString("marchStart")
 	fmt.Println("三月始", marchStart)
+	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
+	marchStartStrUnix := marchStartStr.Unix()
+	fmt.Println("三月使", marchStartStrUnix)
 	marchEnd := this.GetString("marchEnd")
 	fmt.Println("三月末", febEnd)
 	marchEndStr := marchEnd + " 23:59:59"
@@ -1028,4 +1034,124 @@ func (this *CommonApiController) GetMonthProjectList() {
 	marchEndStrUnix := marchEndStrs.Unix()
 	fmt.Println("三月末", marchEndStrUnix)
 
+	aprStart := this.GetString("aprStart")
+	fmt.Println("四月始", aprStart)
+	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
+	aprStartStrUnix := aprStartStr.Unix()
+	fmt.Println("四月使", aprStartStrUnix)
+	aprEnd := this.GetString("aprEnd")
+	fmt.Println("四月末", aprEnd)
+	aprEndStr := aprEnd + " 23:59:59"
+	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
+	aprEndStrsUnix := aprEndStrs.Unix()
+	fmt.Println("四月末", aprEndStrsUnix)
+
+	mayStart := this.GetString("mayStart")
+	fmt.Println("五月始", mayStart)
+	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
+	mayStartStrUnix := mayStartStr.Unix()
+	fmt.Println("五月使", mayStartStrUnix)
+	mayEnd := this.GetString("mayEnd")
+	fmt.Println("五月末", mayEnd)
+	mayEndStr := mayEnd + " 23:59:59"
+	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
+	mayEndStrsUnix := mayEndStrs.Unix()
+	fmt.Println("五月末", mayEndStrsUnix)
+
+	junStart := this.GetString("junStart")
+	fmt.Println("六月始", mayStart)
+	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
+	junStartStrUnix := junStartStr.Unix()
+	fmt.Println("六月使", junStartStrUnix)
+	junEnd := this.GetString("junEnd")
+	fmt.Println("六月末", junEnd)
+	junEndStr := junEnd + " 23:59:59"
+	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
+	junEndStrsUnix := junEndStrs.Unix()
+	fmt.Println("六月末", junEndStrsUnix)
+
+	julStart := this.GetString("julStart")
+	fmt.Println("七月始", julStart)
+	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
+	julStartStrUnix := julStartStr.Unix()
+	fmt.Println("七月使", julStartStrUnix)
+	julEnd := this.GetString("julEnd")
+	fmt.Println("七月末", julEnd)
+	julEndStr := julEnd + " 23:59:59"
+	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
+	julEndStrsUnix := julEndStrs.Unix()
+	fmt.Println("七月末", julEndStrsUnix)
+
+	augStart := this.GetString("augStart")
+	fmt.Println("八月始", augStart)
+	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
+	augStartStrUnix := augStartStr.Unix()
+	fmt.Println("八月使", augStartStrUnix)
+	augEnd := this.GetString("augEnd")
+	fmt.Println("八月末", augEnd)
+	augEndStr := augEnd + " 23:59:59"
+	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
+	augEndStrsUnix := augEndStrs.Unix()
+	fmt.Println("八月末", augEndStrsUnix)
+
+	sepStart := this.GetString("sepStart")
+	fmt.Println("九月始", sepStart)
+	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
+	sepStartStrUnix := sepStartStr.Unix()
+	fmt.Println("九月使", sepStartStrUnix)
+	sepEnd := this.GetString("sepEnd")
+	fmt.Println("九月末", sepEnd)
+	sepEndStr := sepEnd + " 23:59:59"
+	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
+	sepEndStrsUnix := sepEndStrs.Unix()
+	fmt.Println("九月末", sepEndStrsUnix)
+
+	octStart := this.GetString("octStart")
+	fmt.Println("10月始", octStart)
+	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
+	octStartStrUnix := octStartStr.Unix()
+	fmt.Println("10月使", octStartStrUnix)
+	octEnd := this.GetString("octEnd")
+	fmt.Println("10月末", octEnd)
+	octEndStr := octEnd + " 23:59:59"
+	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
+	octEndStrsUnix := octEndStrs.Unix()
+	fmt.Println("10月末", octEndStrsUnix)
+
+	novStart := this.GetString("novStart")
+	fmt.Println("11月始", novStart)
+	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
+	novStartStrUnix := novStartStr.Unix()
+	fmt.Println("11月使", novStartStrUnix)
+	novEnd := this.GetString("novEnd")
+	fmt.Println("11月末", novEnd)
+	novEndStr := novEnd + " 23:59:59"
+	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
+	novEndStrsUnix := novEndStrs.Unix()
+	fmt.Println("10月末", novEndStrsUnix)
+
+	decStart := this.GetString("decStart")
+	fmt.Println("12月始", novStart)
+	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
+	decStartStrUnix := decStartStr.Unix()
+	fmt.Println("12月使", decStartStrUnix)
+	decEnd := this.GetString("decEnd")
+	fmt.Println("12月末", novEnd)
+	decEndStr := decEnd + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	decEndStrsUnix := decEndStrs.Unix()
+	fmt.Println("12月末", decEndStrsUnix)
+	//统计总共
+	monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	//统计不合格
+	monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"monthlist":   monthlist,
+		"monthNolist": monthNolist,
+	})
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -370,3 +370,128 @@ func (this *NewCommonApiController) GetSeachPatientDetail() {
 		"PatientsInfo": PatientsInfo,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileNormdata() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	//获取系统数据
+	normdata, err := service.GetNormDataByOrgId(orgid)
+	if len(normdata) == 0 {
+		normdata, err := service.GetNormData(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"normdata": normdata,
+		})
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"normdata": normdata,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileProjectlsit() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	fmt.Println("orgid", orgid)
+	lapseto, _ := this.GetInt64("lapseto")
+	fmt.Println("专柜", lapseto)
+	itemtype, _ := this.GetInt64("itemtype")
+	fmt.Println("itemtype", itemtype)
+	modetype, _ := this.GetInt64("modeltype")
+	fmt.Println(modetype)
+
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度开始时间", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("第一季度结束时间", fisrtQuarterEndStrUnix)
+
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("第二季度开始时间", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度开始时间", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度结束时间", threeQuarterEndStrUnix)
+
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度开始时间", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
+
+	//按季度统计
+	if itemtype == 1 {
+		//统计总共
+		list, err := service.GetProjectList(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//统计达标个数
+		standList, err := service.GetProjectStandList(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"standList": standList,
+		})
+	}
+}
+
+func (this *NewCommonApiController) GetMobileFirstQuarter() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	lapseto, _ := this.GetInt64("lapseto")
+	fmt.Println("转归", lapseto)
+	startime := this.GetString("startime")
+	fmt.Println("startime", startime)
+	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
+	fmt.Println("parseDateErr", parseDateErr)
+	statime := startDate.Unix()
+	fmt.Println("开始时间", statime)
+	endtime := this.GetString("endtime")
+	fmt.Println("endtime", endtime)
+	endTimeYMDHmsStr := endtime + " 23:59:59"
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
+	entime := endDate.Unix()
+	fmt.Println("结束日期", entime)
+	//group, parseDateErr := service.GetItemNameGroup(orgid, statime, entime)
+	//quarter, err := service.GetFirstQuarter(orgid, statime, entime)
+	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count": count,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -18,4 +18,7 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getmobileInspectionList", &NewCommonApiController{}, "Get:GetMobileInspectionList")
 	beego.Router("/m/api/getpatientinspectiondetail", &NewCommonApiController{}, "Get:GetPatientInspectionDetail")
 	beego.Router("m/api/getseachpatientdetail", &NewCommonApiController{}, "Get:GetSeachPatientDetail")
+	beego.Router("m/api/getmobilenormdata", &NewCommonApiController{}, "Get:GetMobileNormdata")
+	beego.Router("m/api/getmobileprojectlist", &NewCommonApiController{}, "Get:GetMobileProjectlsit")
+	beego.Router("/m/api/getmobilefirstquarter", &NewCommonApiController{}, "Get:GetMobileFirstQuarter")
 }

models/common_models.go

@@ -290,11 +290,11 @@ type DialysisTotalDataStruct struct {
 	ModeID string `json:"mode_id"`
 }
 
-type UserInspectionProjectCount struct {
-	PatientId int64
-	Count     int64
-	ProjectId int64
-}
+//type UserInspectionProjectCount struct {
+//  PatientId int64
+//  Count     int64
+//  ProjectId int64
+//}
 
 type InspectionReferenceMaps struct {
 	ProjectName        string               `gorm:"-" json:"project_name" form:"project_name"`

models/inspection_models.go

@@ -77,6 +77,12 @@ type UserInspectionProjectCounts struct {
 	Sort                int64
 }
 
+type UserInspectionProjectCount struct {
+	PatientId int64
+	Count     int64
+	ProjectId int64
+}
+
 type UserDoctorAdvicesCount struct {
 	PatientId int64
 	Count     int64
@@ -91,10 +97,11 @@ type InspectionReferenceMap struct {
 }
 
 type InepectionForm struct {
-	Method      string `json:"method"`
-	ProjectId   int64  `json:"project_id"`
-	InspectDate string `json:"inspect_date"`
-	FormItem    []struct {
+	Method         string `json:"method"`
+	ProjectId      int64  `json:"project_id"`
+	InspectDate    string `json:"inspect_date"`
+	OldInspectDate string `json:"old_inspect_date"`
+	FormItem       []struct {
 		ID          int64  `json:"id"`
 		ProjectId   int64  `json:"project_id"`
 		ProjectName string `json:"project_name"`

service/common_service.go

@@ -1080,3 +1080,444 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 	}
 	return
 }
+
+func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCountOne, err error) {
+
+	if lapseto == 0 {
+
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 2 {
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+	return
+}
+
+func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCount, err error) {
+
+	if lapseto == 0 {
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		table := XTReadDB().Table("xt_inspection_reference as r")
+		fmt.Println(table)
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		table := XTReadDB().Table("xt_inspection_reference as r")
+		fmt.Println(table)
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+
+		if lapseto == 2 {
+
+			d := XTReadDB().Table("xt_patients as s")
+			fmt.Println("d", d)
+			db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+			table := XTReadDB().Table("xt_inspection_reference as r")
+			fmt.Println(table)
+			countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+				"SELECT " +
+				"CASE " +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
+				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+				" ELSE '其他'" +
+				"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			countParams := make([]interface{}, 0)
+			countParams = append(countParams, januaryStartStrUnix)
+			countParams = append(countParams, januaryEndStrUnix)
+			countParams = append(countParams, febStartStrStrUnix)
+			countParams = append(countParams, febEndStrUnix)
+			countParams = append(countParams, marchStartStrUnix)
+			countParams = append(countParams, marchEndStrUnix)
+			countParams = append(countParams, aprStartStrUnix)
+			countParams = append(countParams, aprEndStrsUnix)
+			countParams = append(countParams, mayStartStrUnix)
+			countParams = append(countParams, mayEndStrsUnix)
+			countParams = append(countParams, junStartStrUnix)
+			countParams = append(countParams, junEndStrsUnix)
+			countParams = append(countParams, julStartStrUnix)
+			countParams = append(countParams, julEndStrsUnix)
+			countParams = append(countParams, augStartStrUnix)
+			countParams = append(countParams, augEndStrsUnix)
+			countParams = append(countParams, sepStartStrUnix)
+			countParams = append(countParams, sepEndStrsUnix)
+			countParams = append(countParams, octStartStrUnix)
+			countParams = append(countParams, octEndStrsUnix)
+			countParams = append(countParams, novStartStrUnix)
+			countParams = append(countParams, novEndStrsUnix)
+			countParams = append(countParams, decStartStrUnix)
+			countParams = append(countParams, decEndStrsUnix)
+			if orgid > 0 {
+				db = db.Where("x.org_id=?", orgid)
+				countSQL += " AND x.org_id=?"
+				countParams = append(countParams, orgid)
+			}
+			if modetype > 0 {
+				db = db.Where("x.item_id = ?", modetype)
+				countSQL += " AND x.item_id=?"
+				countParams = append(countParams, modetype)
+			}
+			if januaryStartStrUnix > 0 {
+				db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+				countSQL += " AND x.inspect_date >=?"
+				countParams = append(countParams, januaryStartStrUnix)
+			}
+			if decEndStrsUnix > 0 {
+				db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+				countSQL += " AND x.inspect_date <=?"
+				countParams = append(countParams, decEndStrsUnix)
+			}
+			countSQL += ")a GROUP BY nnd"
+			err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+		}
+	}
+	return
+}