新功能

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 # 1
@@ -150,26 +150,26 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 
@@ -221,16 +221,31 @@ redisport = 6379
 redispasswrod = 123456
 redisdb = 0
 
-niprocart =  83
-jms = 80
-fistula_needle_set = 81
-fistula_needle_set_16 = 82
-hemoperfusion = 85
-dialyser_sterilised = 84
-filtryzer = 79
-dialyzers = 10000
-injector = 10001
-bloodlines = 10002
-tubingHemodialysis = 10003
-package = 10004
-aliquid = 10005
+
+        niprocart =  63
+        jms = 58
+        fistula_needle_set = 65
+        fistula_needle_set_16 = 64
+        hemoperfusion = 55
+        dialyser_sterilised = 12
+        filtryzer = 53
+                dialyzers = 8
+                injector = 81
+                bloodlines = 42
+        tubingHemodialysis = 30
+        package = 82
+        aliquid = 83
+
+#niprocart =  83
+#jms = 80
+#fistula_needle_set = 81
+#fistula_needle_set_16 = 82
+#hemoperfusion = 85
+#dialyser_sterilised = 84
+#filtryzer = 79
+#dialyzers = 10000
+#injector = 10001
+#bloodlines = 10002
+#tubingHemodialysis = 10003
+#package = 10004
+#aliquid = 10005

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -2,6 +2,7 @@ package new_mobile_api_controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"fmt"
@@ -24,11 +25,35 @@ func (this *IndexEvaluationApiController) GetAdminUser() {
 //初始化数据
 func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.Org.Id)
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, references2...)
+
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 2)
+		references = append(references, references2...)
+
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
 
+	//adminUserInfo := this.GetMobileAdminUserInfo()
+	//
+	//
+	//
+	//references, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id,1)
+	//references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id,2)
+	//references = append(references, references2...)
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"references": references,
+	//})
+
 }
 
 //获取取值范围
@@ -38,10 +63,20 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueDat
 	item_id, _ := this.GetInt64("item_id")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	var range_vaule []string
+	var qcs models.InspectionReference
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
-		range_vaule = append(range_vaule, qcs.MinRange)
-		range_vaule = append(range_vaule, qcs.LargeRange)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+		} else {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+
+		}
+		//qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		range_vaule = append(range_vaule, qcs.RangeMin)
+		range_vaule = append(range_vaule, qcs.RangeMax)
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
 		for _, item := range inspection {
@@ -84,7 +119,7 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		range_value = qcs.RangeMin + "," + qcs.RangeMax
 
 	} else {
 
@@ -218,7 +253,7 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
 
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		range_value = qcs.RangeMin + "," + qcs.RangeMax
 
 	} else {
 

controllers/pc_index_evaluation_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
@@ -51,7 +52,20 @@ type PCIndexEvaluationApiController struct {
 //初始化数据
 func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetAdminUserInfo()
-	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.CurrentOrgId)
+
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, references2...)
+
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 2)
+		references = append(references, references2...)
+
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
@@ -64,10 +78,19 @@ func (this *PCIndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueD
 	item_id, _ := this.GetInt64("item_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	var range_vaule []string
+	var qcs models.InspectionReference
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_vaule = append(range_vaule, qcs.MinRange)
-		range_vaule = append(range_vaule, qcs.LargeRange)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+		} else {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+
+		}
+
+		range_vaule = append(range_vaule, qcs.RangeMin)
+		range_vaule = append(range_vaule, qcs.RangeMax)
 
 	} else {
 
@@ -113,7 +136,7 @@ func (this *PCIndexEvaluationApiController) GetInspectionChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		range_value = qcs.RangeMin + "," + qcs.RangeMax
 
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
@@ -246,7 +269,7 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 	var range_value string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		range_value = qcs.RangeMin + "," + qcs.RangeMax
 
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)

controllers/schedule_api_controller.go

@@ -570,9 +570,24 @@ func (this *ScheduleApiController) PrintInitData() {
 		return
 	}
 
+	thisTime := time.Now()
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schedules": schedules,
 		"monday":    monday.Unix(),
+		"days":      days,
 	})
 }
 

service/statistics_service/index_evaluation_service.go

@@ -1431,9 +1431,9 @@ func FindOrgInspectionReferenceRangeTypeValue(user_org_id int64, project_id int6
 	return
 }
 
-func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs QualityControlStandard, err error) {
+func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs models.InspectionReference, 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
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND id = ?", user_org_id, project_id, item_id).First(&qcs).Error
 	return
 }
 
@@ -1769,3 +1769,9 @@ func FindOrgQualityControlStandardInspectionReferenceById(user_org_id int64, pro
 	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,qcs.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit,qcs.range_value as range_value   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 AND qcs.inspection_major = ? AND qcs.inspection_minor = ?", user_org_id, user_org_id, project_id, item_id).Scan(&references).Error
 	return
 }
+
+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
+}