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

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -896,3 +896,16 @@ func (this *IndexEvaluationApiController) GetDefaultPatient() {
 	})
 
 }
+
+func (this *IndexEvaluationApiController) GetAllPatients() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	patients, _ := statistics_service.GetOrgPatients(adminUserInfo.Org.Id)
+	if patients == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrgNoPatient)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+	})
+
+}

controllers/new_mobile_api_controllers/statistics_api_controllers.go

@@ -35,4 +35,6 @@ func StatisticsAPIControllersRegisterRouters() {
 	beego.Router("/m/api/adminuser/all", &IndexEvaluationApiController{}, "Get:GetAdminUser")
 	beego.Router("/m/api/defalutpatient/get", &IndexEvaluationApiController{}, "Get:GetDefaultPatient")
 
+	beego.Router("/m/api/patients/get", &IndexEvaluationApiController{}, "Get:GetAllPatients")
+
 }

service/statistics_service/index_evaluation_service.go

@@ -874,10 +874,10 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		for _, item := range bps {
 			if item.SystolicBloodPressure > 160 && item.DiastolicBloodPressure > 100 {
 				total_one++
-			} else if item.SystolicBloodPressure < 140 && item.DiastolicBloodPressure < 99 {
+			} else if item.SystolicBloodPressure < 140 && item.DiastolicBloodPressure < 90 {
 				total_two++
 
-			} else if item.SystolicBloodPressure >= 140 && item.SystolicBloodPressure <= 160 && item.DiastolicBloodPressure >= 99 && item.DiastolicBloodPressure <= 100 {
+			} else if item.SystolicBloodPressure >= 140 && item.SystolicBloodPressure <= 160 && item.DiastolicBloodPressure >= 90 && item.DiastolicBloodPressure <= 100 {
 				total_three++
 			} else {
 
@@ -892,7 +892,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		}
 		newItem1 := &otherItemAmount{
 			Total: total_two,
-			Name:  "小于140/99mmHg",
+			Name:  "小于140/90mmHg",
 			Ratio: "0",
 		}
 		newItem2 := &otherItemAmount{
@@ -924,8 +924,8 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		if patient_id == 0 {
 			tempErr = db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?  ", user_org_id, start_time, end_time).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
-					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 90 THEN '小于140/90mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 90 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
 				).Group("name").Scan(&items).Error
 			db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? AND status = 1  AND created_time >= ? AND created_time <= ? ", user_org_id, start_time, end_time).Count(&Total)
@@ -934,8 +934,8 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 			tempErr = db.Table("xt_assessment_before_dislysis ").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("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
-					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 90 THEN '小于140/90mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 90 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
 				).Group("name").Scan(&items).Error
 
@@ -952,7 +952,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 			if item.Name == "大于160/100mmHg" {
 				isHasConditionOne = true
 			}
-			if item.Name == "小于140/99mmHg" {
+			if item.Name == "小于140/90mmHg" {
 				isHasConditionTwo = true
 			}
 
@@ -975,7 +975,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		if !isHasConditionTwo {
 			newItem := &otherItemAmount{
 				Total: 0,
-				Name:  "小于140/99mmHg",
+				Name:  "小于140/90mmHg",
 				Ratio: "0",
 			}
 			items = append(items, newItem)
@@ -1013,8 +1013,8 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		if patient_id == 0 {
 			tempErr = db.Table("xt_assessment_after_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? ", user_org_id, start_time, end_time).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
-					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 90 THEN '小于140/90mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 90 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
 				).Group("name").Scan(&items).Error
 			db.Table("xt_assessment_after_dislysis").Where("user_org_id=? AND status = 1  AND created_time >= ? AND created_time <= ? ", user_org_id, start_time, end_time).Count(&Total)
@@ -1022,8 +1022,8 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		} else {
 			tempErr = db.Table("xt_assessment_after_dislysis ").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("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
-					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 90 THEN '小于140/90mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 90 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
 				).Group("name").Scan(&items).Error
 
@@ -1040,7 +1040,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 			if item.Name == "大于160/100mmHg" {
 				isHasConditionOne = true
 			}
-			if item.Name == "小于140/99mmHg" {
+			if item.Name == "小于140/90mmHg" {
 				isHasConditionTwo = true
 			}
 
@@ -1063,7 +1063,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		if !isHasConditionTwo {
 			newItem := &otherItemAmount{
 				Total: 0,
-				Name:  "小于140/99mmHg",
+				Name:  "小于140/90mmHg",
 				Ratio: "0",
 			}
 			items = append(items, newItem)
@@ -1114,10 +1114,10 @@ func GetBloodPressureTableData(orgID, patientID int64, page, limit, start, end i
 		db = db.Where("sch.patient_id=?", patientID)
 	}
 	if start != 0 {
-		db = db.Where("sch.created_time>=?", start)
+		db = db.Where("sch.schedule_date>=?", start)
 	}
 	if end != 0 {
-		db = db.Where("sch.created_time<=?", end)
+		db = db.Where("sch.schedule_date<=?", end)
 	}
 	db = db.Preload("VMPredialysisEvaluation", "status = 1 AND user_org_id = ?", orgID).
 		Preload("VMAssessmentAfterDislysis", "status = 1 AND user_org_id = ?", orgID).
@@ -1403,7 +1403,7 @@ func FindOrgInspectionReference(user_org_id int64, range_type int) (references [
 	db := service.XTReadDB()
 	if range_type == 1 {
 
-		err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_type = 1 AND range_max REGEXP '([^0-9.])' AND range_min REGEXP '([^0-9.])' ", user_org_id).Find(&references).Error
+		err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_type = 1 AND  (range_min REGEXP '[^0-9.]') = 0  AND  (range_max REGEXP '[^0-9.]') = 0 ", user_org_id).Find(&references).Error
 
 	} else {
 		err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_type = 2", user_org_id).Find(&references).Error
@@ -1727,3 +1727,29 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 	}
 
 }
+
+type VMPatient struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Lapseto   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (VMPatient) TableName() string {
+	return "xt_patients"
+}
+
+func GetOrgPatients(user_org_id int64) (patient *[]VMPatient, err error) {
+	db := service.XTReadDB()
+	var tempPatient []VMPatient
+	findErr := db.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", user_org_id).Find(&tempPatient).Error
+	if findErr == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+	if findErr != nil {
+		return nil, findErr
+	}
+	return &tempPatient, nil
+}