Merge branch 'xt_statistics_branch'

controllers/mobile_api_controllers/dialysis_api_controller.go

 			prescription_doctor := adminUserInfo.AdminUser.Id
 			prescription.PrescriptionDoctor = prescription_doctor
 		}
+
 		if dialysisPrescription.Creater == 0 { //体重称
 			prescription.Creater = adminUserInfo.AdminUser.Id
 

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"time"
 	})
 }
 
+//化验指标
+
+//初始化数据
+func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0)
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"references": references,
+	})
+
+}
+
+//获取取值范围
+func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
+	range_type, _ := this.GetInt64("range_type")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	var range_vaule []string
+	if range_type == 1 {
+		qcs, _ := statistics_service.FindOrgConfigRnageTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		if qcs.ID == 0 { //没有配置选项
+			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id) //判断是否为集成过来的数据
+			if count <= 0 {                                                             //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_vaule = append(range_vaule, "小于"+reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMin+"～"+reference.RangeMax)
+				range_vaule = append(range_vaule, "大于"+reference.RangeMax)
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
+				range_vaule = append(range_vaule, "小于"+reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMin+"～"+reference.RangeMax)
+				range_vaule = append(range_vaule, "大于"+reference.RangeMax)
+			}
+
+		} else { //有配置
+			range_vaule = append(range_vaule, "小于"+qcs.MinRange)
+			range_vaule = append(range_vaule, qcs.MinRange+"～"+qcs.LargeRange)
+			range_vaule = append(range_vaule, "大于"+qcs.LargeRange)
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRnageTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		for _, item := range inspection {
+			range_vaule = append(range_vaule, item.InspectValue)
+		}
+
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"range_vaule": range_vaule,
+	})
+
+}
+func (this *IndexEvaluationApiController) GetInspectionChartData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	range_type, _ := this.GetInt("range_type")
+	range_value := this.GetString("range_value")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	data, _ := statistics_service.GetInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+func (this *IndexEvaluationApiController) GetInspectionChartTableData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	patient_id, _ := this.GetInt64("patient_id")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+
+	if page == 0 {
+		page = 1
+	}
+	if limit == 0 {
+		limit = 20
+	}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+	data, total, _ := statistics_service.GetInspectionChartTableData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, patient_id, page, limit)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data":  data,
+		"total": total,
+	})
+
+}
+func (this *IndexEvaluationApiController) GetPatientInspectionChartData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	data, _ := statistics_service.GetPatientInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	range_type, _ := this.GetInt("range_type")
+	range_value := this.GetString("range_value")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+
 func (this *IndexEvaluationApiController) GetDialysisProcessIndexChartData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	statistics_type, _ := this.GetInt("statistics_type")

controllers/new_mobile_api_controllers/statistics_api_controllers.go

 
 func StatisticsAPIControllersRegisterRouters() {
 
+	//化验指标
+	beego.Router("/m/api/inspectionindex/init", &IndexEvaluationApiController{}, "Get:GetLaboratoryIndexInitData")
+	beego.Router("/m/api/rangevalue/get", &IndexEvaluationApiController{}, "Get:GetLaboratoryIndexProjectRangeValueData")
+	beego.Router("/m/api/inspectionindex/chart", &IndexEvaluationApiController{}, "Get:GetInspectionChartData")
+	beego.Router("/m/api/inspectionindex/table", &IndexEvaluationApiController{}, "Get:GetInspectionChartTableData")
+	beego.Router("/m/api/patientinspectionindex/chart", &IndexEvaluationApiController{}, "Get:GetPatientInspectionChartData")
+	beego.Router("/m/api/patientinspectionindex/barchart", &IndexEvaluationApiController{}, "Get:GetPatientInspectionBarChartData")
+
 	beego.Router("/m/api/dialysisprocessindex/chart", &IndexEvaluationApiController{}, "Get:GetDialysisProcessIndexChartData")
 	beego.Router("/m/api/dialysisprocessindex/table", &IndexEvaluationApiController{}, "Get:GetDialysisProcessIndexTableData")
 

controllers/schedule_api_controller.go

 					err_log := models.ExportErrLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该患者",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
 		errLogs, _ := service.FindSchedualExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
 		if len(schedules) > 0 {
-			schedule_date := this.GetString("date")
+			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期以及未来的排班数据
 			err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 					err_log := models.ExportErrLog{
 						LogType:   2,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 					err_log := models.ExportErrLog{
 						LogType:   2,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 				err_log := models.ExportErrLog{
 					LogType:   2,
 					UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+					ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 						")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 					Status:     1,
 					CreateTime: time.Now().Unix(),
 						LogType:   3,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
 						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
-						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该患者",
 
 						Status:     1,
 						CreateTime: time.Now().Unix(),

service/statistics_service/index_evaluation_service.go

 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
+	"strings"
 )
 
 func GetOrgFirstPatientInfo(user_org_id int64) (patient *models.Patients, err error) {
 
 		break
 	case 4:
-		err = db.Raw("select assessment_date as date, weight_after as value from xt_assessment_after_dislysis Where status = 1 AND user_org_id = ? AND patient_id = ? AND  created_time <= ? AND  created_time >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date, '%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis Where status = 1 AND user_org_id = ? AND patient_id = ? AND  created_time <= ? AND  created_time >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
 		break
 
 	}
 	return datas, nil
 
 }
+
+func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Count(&count).Error
+	return
+}
+
+func FindOrgInspectionReference(user_org_id int64) (references []*models.InspectionReference, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Find(&references).Error
+	return
+}
+
+func FindProcjectInspectionReference(user_org_id int64, project_id int64, item_id int64) (references models.InspectionReference, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ?", user_org_id, project_id, item_id).First(&references).Error
+	return
+}
+
+func FindOrgInspectionReferenceRnageTypeValue(user_org_id int64, project_id int64, item_id int64) (inspection []*models.Inspection, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&models.Inspection{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ? AND  inspect_type = 2", user_org_id, project_id, item_id).Group("inspect_value").Find(&inspection).Error
+	return
+}
+
+func FindOrgConfigRnageTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs models.QualityControlStandard, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&QualityControlStandard{}).Where("status = 1 AND user_org_id = ? AND inspection_major = ? AND inspection_minor = ?", user_org_id, project_id, item_id).First(&qcs).Error
+	return
+}
+
+func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, range_type int, range_value string) (item []*otherItemAmount, err error) {
+	db := service.XTReadDB()
+	var items []*otherItemAmount
+	var tempErr error
+	selectContent := "CASE"
+	range_value_arr := strings.Split(range_value, ",")
+
+	if range_type == 1 {
+		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ?", user_org_id, start_time, end_time, project_id, item_id).
+			Select("CASE WHEN inspect_value < ? THEN 小于" + range_value_arr[0] +
+				" WHEN inspect_value >= ? AND  inspect_value <= ? THEN " + range_value_arr[0] + "~" + range_value_arr[1] +
+				" WHEN inspect_value > ? THEN 大于" + range_value_arr[1] +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("name").Scan(&items).Error
+	} else {
+		for _, item := range range_value_arr {
+			selectContent = selectContent + " WHEN inspect_value =" + item + " THEN " + "'" + item + "'"
+		}
+		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).
+			Select(selectContent +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("name").Scan(&items).Error
+
+	}
+	return items, tempErr
+
+}
+
+type Patient struct {
+	ID         int64             `gorm:"column:id" json:"id" form:"id"`
+	Name       string            `gorm:"column:name" json:"name" form:"name"`
+	Inspection models.Inspection `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+}
+
+func (Patient) TableName() string {
+	return "xt_patients"
+}
+
+func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64, page, limit int64) (datas []*Patient, total int64, err error) {
+	db := service.XTReadDB()
+	offset := (page - 1) * limit
+	err = db.Select("id, name from xt_patients RIGHT JOIN  xt_inspection ON xt_inspection.patient_id = xt_patients.id AND xt_inspection.created_time >= ? AND xt_inspection.created_time >= ? AND xt_inspection.project_id = ? AND xt_inspection.item_id = ?", start_time, end_time, project_id, item_id).Where("user_org_id = ? AND status = 1", user_org_id).Preload("Inspection", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND created_time >= ? AND created_time >= ? AND project_id = ? AND item_id = ?", start_time, end_time, project_id, item_id).Order("created_time DESC")
+	}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
+	return datas, total, err
+}
+
+func GetPatientInspectionChartData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64) (datas []*ProcessIndexDataStruct, err error) {
+	db := service.XTReadDB()
+	err = db.Raw("select from_unixtime(inspect_date, '%Y-%m-%d') as date, inspect_value as value from xt_inspection  Where status = 1 AND user_org_id = ? AND patient_id = ? AND project_id = ? AND item_id = ? created_time <= ? AND  created_time >= ? ", user_org_id, patient_id, project_id, item_id, end_time, start_time).Scan(&datas).Error
+	if err != nil {
+		return nil, err
+	}
+	return datas, nil
+
+}
+
+func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, range_type int, range_value string, patient_id int64) (item []*otherItemAmount, err error) {
+	db := service.XTReadDB()
+	var items []*otherItemAmount
+	var tempErr error
+	selectContent := "CASE"
+	range_value_arr := strings.Split(range_value, ",")
+
+	if range_type == 1 {
+		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND patient_id = ?", user_org_id, start_time, end_time, project_id, item_id, patient_id).
+			Select("CASE WHEN inspect_value < ? THEN 小于" + range_value_arr[0] +
+				" WHEN inspect_value >= ? AND  inspect_value <= ? THEN " + range_value_arr[0] + "~" + range_value_arr[1] +
+				" WHEN inspect_value > ? THEN 大于" + range_value_arr[1] +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("name").Scan(&items).Error
+	} else {
+		for _, item := range range_value_arr {
+			selectContent = selectContent + " WHEN inspect_value =" + item + " THEN " + "'" + item + "'"
+		}
+		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND patient_id = ?", user_org_id, start_time, end_time, patient_id).
+			Select(selectContent +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("name").Scan(&items).Error
+
+	}
+	return items, tempErr
+
+}

service/statistics_service/index_models.go

 func (VMDeviceNumber) TableName() string {
 	return "xt_device_number"
 }
+
+type QualityControlStandard struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
+	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
+	LargeRange      string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+}
+
+func (QualityControlStandard) TableName() string {
+	return "xt_quality_control_standard"
+}