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

conf/app.conf

@@ -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/dialysis_api_controller.go

@@ -4869,7 +4869,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4878,7 +4878,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
-	if template.TemplateId == 1 {
+	if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 		if ultrafiltration_rate > 0 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value

controllers/dialysis_record_api_controller.go

@@ -2159,7 +2159,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院
-				if template.TemplateId == 1 {
+				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 					ultrafiltration_rate = value
 				}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -286,7 +286,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
-	fmt.Println("----------------------------", getDialysisOrderErr)
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -383,7 +382,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		return
 	}
 
-	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
+	//headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
 
 	_, gobalConfig := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 	goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
@@ -410,12 +409,12 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"last_predialysis_evaluation":    lastPredialysisEvaluation,
 		"last_assessment_after_dislysis": lastAssessmentAfterDislysis,
 		"last_monitor_record":            lastMonitorRecord,
-		"special_premission":             headNurses,
-		"config":                         gobalConfig,
-		"types":                          goodTypes,
-		"goodInfos":                      goodInfos,
-		"dry_weight":                     lastDryWeightDislysis,
-		"system_prescription":            systemDialysisPrescribe,
+		//"special_premission":             headNurses,
+		"config":              gobalConfig,
+		"types":               goodTypes,
+		"goodInfos":           goodInfos,
+		"dry_weight":          lastDryWeightDislysis,
+		"system_prescription": systemDialysisPrescribe,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -2756,7 +2755,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminUserInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 			}
@@ -5613,7 +5612,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -5622,7 +5621,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
-	if template.TemplateId == 1 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
+	if template.TemplateId == 1 && adminInfo.Org.Id != 9849 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
 		if ultrafiltration_rate > 0 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value

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,
 	})
 }
 

models/dialysis.go

@@ -274,22 +274,11 @@ func (PredialysisEvaluation) TableName() string {
 }
 
 type PredialysisEvaluationList struct {
-	ID                          int64   `gorm:"column:id" json:"id"`
-	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                   int64   `gorm:"column:patient_id" json:"patient_id"`
-	AssessmentDate              int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	DryWeight                   float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency"`
-	WeighingWay                 string  `gorm:"column:weighing_way" json:"weighing_way"`
-	WeighingBefore              float64 `gorm:"column:weighing_before" json:"weighing_before"`
-	AdditionalWeight            float64 `gorm:"column:additional_weight" json:"additional_weight"`
-	WeightBefore                float64 `gorm:"column:weight_before" json:"weight_before"`
-	Evaluator                   int64   `gorm:"column:evaluator" json:"evaluator"`
-	Creater                     int64   `gorm:"column:creater" json:"creater"`
-	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
+	ID             int64   `gorm:"column:id" json:"id"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightBefore   float64 `gorm:"column:weight_before" json:"weight_before"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

models/patient_models.go

@@ -230,11 +230,9 @@ type DialysisPrescriptionList struct {
 	ID         int64 `gorm:"column:id" json:"id"`
 	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id"`
 	PatientId  int64 `gorm:"column:patient_id" json:"patient_id"`
-	ModeId     int64 `gorm:"column:mode_id" json:"mode_id"`
 	RecordDate int64 `gorm:"column:record_date" json:"record_date"`
 	RecordId   int64 `gorm:"column:record_id" json:"record_id"`
 	Creater    int64 `gorm:"column:creater" json:"creater"`
-	Modifier   int64 `gorm:"column:modifier" json:"modifier"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

service/dialysis_service.go

@@ -608,11 +608,9 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("TreatmentSummary", "status = 1 AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
@@ -639,7 +637,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time desc")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time asc")
 		}).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)

service/mobile_dialysis_service.go

@@ -30,7 +30,6 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
@@ -59,7 +58,6 @@ func MobileGetWaitingScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSch
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
@@ -86,13 +84,10 @@ type MDialysisScheduleVM struct {
 
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
-	DeviceZone               *models.DeviceZone                `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	TreatmentMode            *models.TreatmentMode             `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
-	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
-	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -239,23 +234,32 @@ type MDialysisOrderVMList struct {
 	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
 	Stage int64 `gorm:"column:stage" json:"stage"`
 	// Remark         string `gorm:"column:remark" json:"remark"`
-	BedID          int64            `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64            `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64            `gorm:"column:finish_nurse" json:"finish_nurse"`
-	Status         int64            `gorm:"column:status" json:"status"`
-	PunctureNurse  int64            `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber   *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator        int64            `gorm:"column:creator" json:"creator"`
-	Modifier       int64            `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64            `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64            `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType   int64            `gorm:"column:schedual_type" json:"schedual_type"`
+	BedID        int64            `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse   int64            `gorm:"column:start_nurse" json:"start_nurse"`
+	Status       int64            `gorm:"column:status" json:"status"`
+	DeviceNumber *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator      int64            `gorm:"column:creator" json:"creator"`
 }
 
 func (MDialysisOrderVMList) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type VMDoctorAdvice struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	GroupNo        int64 `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
+}
+
+func (VMDoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder

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
+}