Merge branch 'xt_statistics_branch'

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -2,7 +2,6 @@ package new_mobile_api_controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"fmt"
@@ -25,20 +24,7 @@ func (this *IndexEvaluationApiController) GetAdminUser() {
 //初始化数据
 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, 1)
-		references_two, _ := statistics_service.FindOrgInspectionReference(0, 2)
-		references = append(references, references_two...)
-
-	} else {
-		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 1)
-		references_two, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 2)
-		references = append(references, references_two...)
-
-	}
-
+	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.Org.Id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
@@ -55,33 +41,13 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueDat
 	var range_vaule []string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(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.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.RangeMax)
-			}
-
-		} else { //有配置
-			range_vaule = append(range_vaule, qcs.MinRange)
-			range_vaule = append(range_vaule, qcs.LargeRange)
-
-		}
-
+		range_vaule = append(range_vaule, qcs.MinRange)
+		range_vaule = append(range_vaule, qcs.LargeRange)
 	} else {
-
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(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,
@@ -119,22 +85,7 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(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_value = reference.RangeMin + "," + reference.RangeMax
-
-			} else { //是，读集成过来的参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-
-			}
-
-		} else { //有配置
-			range_value = qcs.MinRange + "," + qcs.LargeRange
-
-		}
+		range_value = qcs.MinRange + "," + qcs.LargeRange
 
 	} else {
 
@@ -264,22 +215,8 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(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_value = reference.RangeMin + "," + reference.RangeMax
-
-			} else { //是，读集成过来的参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-
-			}
-
-		} else { //有配置
-			range_value = qcs.MinRange + "," + qcs.LargeRange
 
-		}
+		range_value = qcs.MinRange + "," + qcs.LargeRange
 
 	} else {
 

controllers/pc_index_evaluation_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
@@ -52,24 +51,10 @@ type PCIndexEvaluationApiController struct {
 //初始化数据
 func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetAdminUserInfo()
-	var references []*models.InspectionReference
-	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
-	if count <= 0 {
-		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
-		temp_references, _ := statistics_service.FindOrgInspectionReference(0, 2)
-		references = append(references, temp_references...)
-
-	} else {
-		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 1)
-		temp_references, _ := statistics_service.FindOrgInspectionReference(0, 2)
-		references = append(references, temp_references...)
-
-	}
-
+	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.CurrentOrgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
-
 }
 
 //获取取值范围
@@ -81,24 +66,8 @@ func (this *PCIndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueD
 	var range_vaule []string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		if qcs.ID == 0 { //没有配置选项
-			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
-			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.RangeMax)
-
-			} else { //是，读集成过来的参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
-				range_vaule = append(range_vaule, reference.RangeMin)
-				range_vaule = append(range_vaule, reference.RangeMax)
-			}
-
-		} else { //有配置
-			range_vaule = append(range_vaule, qcs.MinRange)
-			range_vaule = append(range_vaule, qcs.LargeRange)
-
-		}
+		range_vaule = append(range_vaule, qcs.MinRange)
+		range_vaule = append(range_vaule, qcs.LargeRange)
 
 	} else {
 
@@ -144,19 +113,7 @@ func (this *PCIndexEvaluationApiController) GetInspectionChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		if qcs.ID == 0 { //没有配置选项
-			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
-			if count <= 0 {                                                                   //不是，读系统参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-
-			} else { //是，读集成过来的参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-			}
-		} else { //有配置
-			range_value = qcs.MinRange + "," + qcs.LargeRange
-		}
+		range_value = qcs.MinRange + "," + qcs.LargeRange
 
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
@@ -286,19 +243,7 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		if qcs.ID == 0 { //没有配置选项
-			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
-			if count <= 0 {                                                                   //不是，读系统参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-			} else { //是，读集成过来的参考值
-				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
-				range_value = reference.RangeMin + "," + reference.RangeMax
-			}
-
-		} else { //有配置
-			range_value = qcs.MinRange + "," + qcs.LargeRange
-		}
+		range_value = qcs.MinRange + "," + qcs.LargeRange
 
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)

service/statistics_service/index_evaluation_service.go

@@ -1278,7 +1278,7 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	case 1:
 		for _, item := range datas {
 			var Total int64
-			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND  FIND_IN_SET('内瘘',config.name) > 0   Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND (config.org_id = ? OR config.org_id = 0)  AND config.parent_id = ? AND  FIND_IN_SET('内瘘',config.name) > 0   Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 			item.PunctureCount = Total
 
 			if math.IsNaN(float64(item.PunctureCount) / float64(NewTotalOne)) {
@@ -1293,7 +1293,7 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	case 2:
 		for _, item := range datas {
 			var Total int64
-			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND  (config.org_id = ? OR config.org_id = 0) AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 			item.ChangemedicineCount = Total
 
 			if math.IsNaN(float64(item.ChangemedicineCount) / float64(NewTotalTwo)) {
@@ -1393,9 +1393,30 @@ func GetAllAdminUser(user_org_id int64) (datas []*AdminUser, err error) {
 
 }
 
-func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
+//func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
+//	db := service.XTReadDB()
+//	err = db.Model(&models.QualityControlStandard{}).Where("status = 1 AND org_id = ? ", user_org_id).Count(&count).Error
+//	return
+//}
+
+type InspectionReference struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Project     string `gorm:"column:project" json:"project" form:"project"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemName    string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	RangeType   int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin    string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax    string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue  string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	Unit        string `gorm:"column:unit" json:"unit" form:"unit"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func FindOrgQualityControlStandardInspectionReference(user_org_id int64) (references []*InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Count(&count).Error
+	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,reference.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1", user_org_id, user_org_id).Scan(&references).Error
 	return
 }