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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1155,3 +1155,42 @@ func (this *CommonApiController) GetMonthProjectList() {
 		"monthNolist": monthNolist,
 	})
 }
+
+func (this *CommonApiController) GetPatientscontrol() {
+
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	fmt.Println("org", orgid)
+	lapstor, _ := this.GetInt64("lapstor")
+	fmt.Println("lapstor", lapstor)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+
+	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//获取最后一次数据
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+		"total":    total,
+		"control":  control,
+	})
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -45,4 +45,5 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getfirstquarter", &CommonApiController{}, "Get:GetFirstQuarter")
 	beego.Router("/com/api/getprojectlist", &CommonApiController{}, "Get:GetProjectList")
 	beego.Router("/com/api/getmonthprojectlist", &CommonApiController{}, "Get:GetMonthProjectList")
+	beego.Router("/com/api/getpatientscontrol", &CommonApiController{}, "Get:GetPatientscontrol")
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -495,3 +495,170 @@ func (this *NewCommonApiController) GetMobileFirstQuarter() {
 		"count": count,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileMonthProjectList() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	lapseto, _ := this.GetInt64("lapseto")
+	fmt.Println("lapseto", lapseto)
+	itemtype, _ := this.GetInt64("itemtype")
+	fmt.Println("itemtype", itemtype)
+	modetype, _ := this.GetInt64("modeltype")
+	fmt.Println("modetype", modetype)
+	januaryStart := this.GetString("januaryStart")
+	fmt.Println("一月始", januaryStart)
+	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
+	januaryStartStrUnix := januaryStartStr.Unix()
+	fmt.Println("一月使", januaryStartStrUnix)
+	januaryEnd := this.GetString("januaryEnd")
+	fmt.Println("一月末", januaryEnd)
+	januaryEndStr := januaryEnd + " 23:59:59"
+	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
+	januaryEndStrUnix := januaryEndStrs.Unix()
+	fmt.Println("一月末", januaryEndStrUnix)
+
+	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"
+	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
+	febEndStrUnix := febEndStrs.Unix()
+	fmt.Println("二月末", febEndStrUnix)
+
+	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"
+	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
+	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_router.go

@@ -21,4 +21,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("m/api/getmobilenormdata", &NewCommonApiController{}, "Get:GetMobileNormdata")
 	beego.Router("m/api/getmobileprojectlist", &NewCommonApiController{}, "Get:GetMobileProjectlsit")
 	beego.Router("/m/api/getmobilefirstquarter", &NewCommonApiController{}, "Get:GetMobileFirstQuarter")
+	beego.Router("/m/api/getmobilemonthprojectlist", &NewCommonApiController{}, "Get:GetMobileMonthProjectList")
 }

models/common_models.go

@@ -386,3 +386,29 @@ type ProjectCount struct {
 	Total string
 	Count int64
 }
+
+type PatientInspectionCount struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	RangMax      string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangMin      string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+}
+
+func (PatientInspectionCount) TableName() string {
+
+	return "xt_inspection"
+}

service/common_service.go

@@ -1521,3 +1521,54 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 	}
 	return
 }
+
+func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64, page int64, limit int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
+
+	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+	table := readDb.Table("xt_patients as s")
+	fmt.Println(table)
+	d := readDb.Table(" xt_inspection_reference as r")
+	fmt.Println(d)
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if lapstor == 0 {
+		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Group("x.patient_id").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+
+	return inspection, total, err
+}
+
+func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
+
+	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+	table := readDb.Table("xt_patients as s")
+	fmt.Println(table)
+	d := readDb.Table(" xt_inspection_reference as r")
+	fmt.Println(d)
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if lapstor == 0 {
+		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+
+	return inspection, err
+}