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

controllers/dialysis_api_controller.go

@@ -112,6 +112,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/schedule/getmobileschedulelist", &DialysisApiController{}, "Get:GetMobileScheduleList")
 
+	beego.Router("/api/patient/saveinformation", &DialysisApiController{}, "Get:SaveInformation")
+
 	beego.Router("/api/patient/savedialysisInformationsetting", &DialysisApiController{}, "Get:SaveDialysisInformationSetting")
 
 	beego.Router("/api/patient/getdialyisinformationsetting", &DialysisApiController{}, "Get:GetDialysisInformationSetting")
@@ -618,8 +620,51 @@ func (c *DialysisApiController) PostPrescription() {
 			prescription.AdminUserId = adminUserInfo.AdminUser.Id
 		}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		err := service.AddSigleRecord(&prescription)
 
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     1,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
 		//清空key 值
@@ -646,6 +691,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 	} else { //修改
 		if mode_id > 0 {
+
 			var str string
 			//查找该机构用的是什么透析器
 			filedConfig, _ := service.GetFiledConfig(adminUserInfo.CurrentOrgId)
@@ -689,6 +735,31 @@ func (c *DialysisApiController) PostPrescription() {
 		prescription.Modifier = adminUserInfo.AdminUser.Id
 		prescription.ID = dialysisPrescription.ID
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
 		//修改处方
@@ -902,6 +973,30 @@ func (c *DialysisApiController) PostSoulution() {
 	//	}
 	//}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		PatientId:                 patient,
@@ -1072,6 +1167,24 @@ func (c *DialysisApiController) PostSoulution() {
 	//  }
 	//}
 
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     1,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -1455,6 +1568,31 @@ func (c *DialysisApiController) PostDouleCheck() {
 		NeedleBatchNumber:          needle_batch_number,
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if check.ID == 0 { //新增
 		doubleCheck.FirstCheckTime = firstCheckTimeDate
@@ -1463,6 +1601,48 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.Modifier = modifier
 
 		err := service.AddSigleDoubleCheck(&doubleCheck)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     5,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  id,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 5, id)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
+
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 
@@ -1594,9 +1774,51 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		Diacrisis:                    diacrisis,
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	if receiveTreatment.ID == 0 { //新增
 		receiveTreatmentAsses.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleReceiveTreatmentAssesRecord(&receiveTreatmentAsses)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     2,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  id,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 2, id)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":receive_treatment_asses"
 		redis := service.RedisClient()
 		//清空key 值
@@ -1776,7 +1998,33 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		}
 
 		assessment.UpdatedTime = time.Now().Unix()
+
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -1800,6 +2048,22 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		assessment.AssessmentDate = recordDate.Unix()
 
 		err = service.AddSigleAssessmentAfterDislysisRecord(&assessment)
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     9,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 9, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -2031,8 +2295,49 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 		}
 
-		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 
+		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     3,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 3, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 {
 			var dewater_amount float64
 			dewater_amount = 0
@@ -2483,6 +2788,31 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			}
 		}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		err := service.UpadatePredialysisEvaluation(&assessmentBeforeDislysis)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
@@ -2561,7 +2891,48 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 	_, tempTreatmentSummary := service.FindTreatmentSummaryByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if tempTreatmentSummary.ID == 0 { //新增
 		treatmentSummary.Creater = adminUserInfo.AdminUser.Id
+
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err := service.AddSigleSummaryRecord(&treatmentSummary)
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     10,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 10, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
 		redis := service.RedisClient()
 		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
@@ -3091,8 +3462,33 @@ func (this *DialysisApiController) DelMonitor() {
 	//		}
 	//	}
 	//}
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= monitor.MonitoringDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, monitor.MonitoringDate, adminInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 
 	err := service.DisableMonitor(adminInfo.CurrentOrgId, patientID, recordID, adminInfo.AdminUser.Id)
+
 	key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_records"
 	redis := service.RedisClient()
 	//清空key 值
@@ -3213,7 +3609,49 @@ func (c *DialysisApiController) CreateMonitor() {
 		Dicarbonate:               dicarbonate,
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= monitoring_date {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, monitoring_date, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	err := service.CreateMonitor(&monitorRecord)
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     7,
+		RecordDate: monitoring_date,
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, monitoring_date, 7, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
+
 	redis := service.RedisClient()
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(monitoring_date, 10) + ":monitor_record_list_all"
 
@@ -4318,6 +4756,24 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 	}
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
+
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     4,
+		RecordDate: AdviceDate,
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, AdviceDate, 4, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	redis := service.RedisClient()
 	formatAdviceDate := theTime.Format("2006-01-02")
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
@@ -6196,13 +6652,13 @@ func (this *DialysisApiController) GetDialysisInformationSetting() {
 
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
-	informationSetting, _ := service.GetDialysisInformationSetting(orgId)
+	informationSetting, _ := service.GetDialysisInformationSettingList(orgId)
 
 	//未审核
 	infor, total, _ := service.GetDialysisInformationIsNoCheck(orgId, limit, page, 2)
 
-	//已经审核
-	inforList, totalOne, _ := service.GetDialysisInformationIsNoCheck(orgId, limit, page, 1)
+	//全部
+	inforList, totalOne, _ := service.GetDialysisInformationIsNoCheckOne(orgId, limit, page, 1)
 
 	patients, _ := service.GetAllpatientThirty(orgId)
 
@@ -6270,3 +6726,58 @@ func (this *DialysisApiController) GetDialysisPatientsFlow() {
 		}
 	}
 }
+
+func (this *DialysisApiController) SaveInformation() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	record_date, _ := this.GetInt64("record_date")
+	adviceDate := this.GetString("selected_date")
+	timeLayout2 := "2006-01-02"
+	loc2, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout2, adviceDate, loc2)
+	AdviceDate := theTime.Unix()
+
+	module, _ := this.GetInt64("module")
+
+	remark := this.GetString("remark")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	information := models.XtDialysisInformation{
+		Module:            module,
+		PatientId:         patient_id,
+		RecordDate:        record_date,
+		ApplicationDate:   AdviceDate,
+		Creater:           creater,
+		ApplicationStatus: 2,
+		Checker:           0,
+		CheckTime:         0,
+		Remark:            remark,
+		UserOrgId:         orgId,
+		Ctime:             time.Now().Unix(),
+		Status:            1,
+		Mtime:             0,
+	}
+
+	infor, _ := service.GetDialysisInoformationById(patient_id, record_date, orgId, module)
+	if infor.ID == 0 {
+		err := service.CreatedDialysisInformation(information)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"information": information,
+			})
+			return
+		}
+	}
+	if infor.ID > 0 {
+		err := service.UpdateDialysisInformationById(patient_id, record_date, orgId, module, AdviceDate, remark)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"information": information,
+			})
+			return
+		}
+	}
+
+}

controllers/dialysis_record_api_controller.go

@@ -635,6 +635,31 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		orderID = dialysisOrder.ID
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= scheduleDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, scheduleDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	if monitorParam.ID <= 0 { // 新建记录
 		monitor := models.MonitoringRecord{
 			UserOrgId:       adminUserInfo.CurrentOrgId,
@@ -693,6 +718,22 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			Dicarbonate:                 monitorParam.Dicarbonate,
 		}
 		createErr := service.CreateMonitor(&monitor)
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     7,
+			RecordDate: monitorParam.MonitoringDate,
+			Sourse:     1,
+			PatientId:  patientID,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, monitorParam.MonitoringDate, 7, patientID)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()
 		//清空key 值
@@ -1011,6 +1052,30 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
@@ -1044,6 +1109,23 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
+
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     6,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patientID,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 6, patientID)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	//更新患者表排班备注
 	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, patientID, schedule_remark)
 
@@ -1218,6 +1300,23 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			}
 
 			err := service.CreateMonitor(&record)
+
+			finish := models.XtDialysisFinish{
+				IsFinish:   1,
+				UserOrgId:  adminUserInfo.CurrentOrgId,
+				Status:     1,
+				Ctime:      time.Now().Unix(),
+				Mtime:      0,
+				Module:     7,
+				RecordDate: recordDate.Unix(),
+				Sourse:     1,
+				PatientId:  patientID,
+			}
+
+			dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 7, patientID)
+			if dialysisFinish.ID == 0 {
+				service.CreateDialysisFinish(finish)
+			}
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
 			redis := service.RedisClient()
@@ -1491,6 +1590,23 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
+	finishS := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     9,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patientID,
+	}
+
+	dialysisFinishs, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 9, patientID)
+	if dialysisFinishs.ID == 0 {
+		service.CreateDialysisFinish(finishS)
+	}
+
 	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
@@ -1572,8 +1688,49 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		http.PostForm(api, values)
 	}()
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= recordDate.Unix() {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	//执行下机
 	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     8,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patientID,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 8, patientID)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	defer redis.Close()
@@ -1794,6 +1951,29 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		CatheterOperation:      catheter_operation,
 	}
 
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= tempDialysisRecord.DialysisDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
 
 	order, _ := service.GetLastPatientOrder(record_id)
@@ -1926,6 +2106,31 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)
+
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= tempDialysisRecords.DialysisDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	defer redis.Close()

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -119,6 +119,30 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		return
 	}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= date {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, date, adminInfo.Org.Id)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	record := models.MonitoringRecord{
 		UserOrgId:       adminInfo.Org.Id,
 		PatientId:       patientID,
@@ -179,6 +203,22 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	}
 
 	err := service.CreateMonitor(&record)
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  record.UserOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     7,
+		RecordDate: record.MonitoringDate,
+		Sourse:     1,
+		PatientId:  patientID,
+	}
+
+	dialysisFinish, err := service.GetDialysisFinish(record.UserOrgId, record.MonitoringDate, 7, patientID)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()
 	//清空key 值
@@ -351,6 +391,31 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.HeparinAmount = heparin_amount
 	monitor.Dehydration = dehydration
 	monitor.FilterPressure = filter_pressure
+
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(monitor.MonitoringDate)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= monitor.MonitoringDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(id, monitor.MonitoringDate, monitor.UserOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	monitor.ReplacementSpeed = replacement_speed
 	monitor.Dicarbonate = dicarbonate
 	err = service.UpdateMonitor(monitor)
@@ -399,6 +464,31 @@ func (this *DialysisAPIController) DeleteMonitor() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= monitor.MonitoringDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(monitor.PatientId, monitor.MonitoringDate, monitor.UserOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	redis := service.RedisClient()
@@ -406,7 +496,6 @@ func (this *DialysisAPIController) DeleteMonitor() {
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_records"
 	redis.Set(keyOne, "", time.Second)
-	fmt.Println("keyo呢32332322332332232332", keyOne)
 	redis.Close()
 
 	if err != nil {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -151,16 +151,15 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			var userRolePurviews string
 			var userRolePurviewsArr []string
 
-			fmt.Println("----redis 开始----")
-			fmt.Println(purviews_json_str)
-			fmt.Println("----redis 结束----")
+			//fmt.Println("----redis 开始----")
+			//fmt.Println(purviews_json_str)
+			//fmt.Println("----redis 结束----")
 
-			fmt.Println("purviews_json_str0000000000000000000000000000", len(purviews_json_str))
 			if len(purviews_json_str) == 0 {
 				for _, item := range roles {
 					role_id, _ := strconv.ParseInt(item, 10, 64)
 					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
-					fmt.Println("2333333333333333333", purviews)
+
 					if len(userRolePurviews) == 0 {
 						userRolePurviews = purviews
 					} else {
@@ -171,7 +170,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 				userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
 				//缓存数据
 				purview_json, err := json.Marshal(userRolePurviewsArr)
-				fmt.Println("errr-------------------", err)
 				if err == nil {
 					redis.Set(key, purview_json, time.Minute*60*60*24)
 				}
@@ -189,6 +187,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
+
 			for _, item := range allPermission {
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -190,4 +190,13 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/checkmobileadvice", &DialysisAPIController{}, "Get:GetCheckMobileAdvice")
 
 	beego.Router("/m/api/getnewdoctorlisttoday", &DialysisAPIController{}, "Get:GetNewDoctorListToday")
+
+	beego.Router("/m/api/savemobileinformation", &DialysisAPIController{}, "Get:SaveMobileInformation")
+
+	beego.Router("/m/api/getmobileinformation", &DialysisAPIController{}, "Get:GetMobileInformation")
+
+	beego.Router("/m/api/getmobileinformationone", &DialysisAPIController{}, "Get:GetMobileInformationOne")
+
+	beego.Router("/m/api/checkmobileinformation", &DialysisAPIController{}, "Get:CheckMobileInformation")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -310,6 +310,31 @@ func (c *PatientApiController) EditDoctorAdvice() {
 		adviceSlice, _ := service.FindAdviceByGoroupNo(adminUserInfo.Org.Id, advice.GroupNo)
 		sourceAdvice, _ := service.FindOldDoctorAdvice(adminUserInfo.Org.Id, advice.ID)
 		if len(adviceSlice) == 1 {
+
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= sourceAdvice.AdviceDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要修改子医嘱的开始时间，如果相同直接修改，不需要修改子医嘱的开始时间
 			if advice.StartTime == sourceAdvice.StartTime {
 				err = service.UpdateDoctorAdvice(&advice)
@@ -331,7 +356,28 @@ func (c *PatientApiController) EditDoctorAdvice() {
 				redis.Set(keyOne, "", time.Second)
 			}
 		} else if len(adviceSlice) > 1 {
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= sourceAdvice.AdviceDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
 
+				}
+			}
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要重新分配组，如果相同直接修改，不需要分配组
 			if advice.StartTime == sourceAdvice.StartTime {
 				err = service.UpdateDoctorAdvice(&advice)
@@ -359,6 +405,28 @@ func (c *PatientApiController) EditDoctorAdvice() {
 			}
 		}
 	} else {
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, advice.AdviceDate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		isChangeGroup = false
 		err = service.UpdateDoctorAdvice(&advice)
 		redis := service.RedisClient()
@@ -382,6 +450,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 		})
 
 	} else {
+
 		newGroupAdvice, err := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, advice.GroupNo)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -552,6 +621,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
 
+	record_date, _ := c.GetInt64("record_date")
+
 	if origin != 2 {
 		adminUserInfo := c.GetMobileAdminUserInfo()
 		execution_staff := adminUserInfo.AdminUser.Id
@@ -621,6 +692,32 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		var err error
 
 		if groupno > 0 {
+
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+				fmt.Println("cha_time----------------", cha_time)
+				fmt.Println("advices.232323232222", record_date)
+				if cha_time >= record_date {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -643,7 +740,30 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			defer redis.Close()
 		} else {
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
 
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= record_date {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -1133,6 +1253,31 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			item.ExecutionStaff = adminInfo.AdminUser.Id
 			item.ExecutionTime = theTime.Unix()
 			item.IsMobile = 1
+
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(item.UserOrgId)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= item.AdviceDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, item.UserOrgId)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.SaveHisDoctorAdvice(item)
 			if err == nil {
 				drugError := models.XtDrugError{
@@ -1557,6 +1702,30 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	var err error
 	if groupno > 0 {
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advices.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
@@ -1568,6 +1737,28 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		defer redis.Close()
 
 	} else {
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advices.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
 
 		err = service.ModifyExceDoctorAdviceByGroupNoOne(&advices, ids)
@@ -1638,7 +1829,8 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 func (c *PatientApiController) CheckDoctorAdvice() {
 	origin, _ := c.GetInt64("origin", 0)
-
+	record_date, _ := c.GetInt64("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
 	if origin != 2 {
 		groupno, _ := c.GetInt64("groupno", -1)
 		var ids []string
@@ -1708,6 +1900,31 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		}
 		var err error
 		if groupno > 0 {
+
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= record_date {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -1734,6 +1951,30 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 				//timeLayout2 := "2006-01-02"
 				//loc, _ := time.LoadLocation("Local")
 				//theTime, _ := time.ParseInLocation(timeLayout2, t, loc)
+				// 查询信息规挡的设置天数
+
+				infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+				if infor.ID > 0 {
+
+					var cha_time int64
+
+					timeNowStr := time.Now().Format("2006-01-02")
+					timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+					//今日的日期减去设置的日期
+					cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+					if cha_time >= advices.AdviceDate {
+						//查询审核是否允许
+						infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+						//申请状态不允许的情况 拒绝修改
+						if infor.ApplicationStatus != 1 {
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+							return
+						}
+
+					}
+				}
 				err = service.BatchCheckOldDoctorAdvice(&advices, ids, adminUserInfo.Org.Id, advice.AdviceDate)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 				redis := service.RedisClient()
@@ -1784,6 +2025,30 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			item.Checker = adminInfo.AdminUser.Id
 			item.CheckTime = time.Now().Unix()
 			item.CheckState = 1
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= record_date {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.SaveHisDoctorAdvice(item)
 			redis := service.RedisClient()
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
@@ -2385,8 +2650,48 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 	}
 	// }
 
-	err = service.UpadatePredialysisEvaluation(&evaluation)
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
 
+		if cha_time >= evaluation.AssessmentDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(id, evaluation.AssessmentDate, adminUserInfo.Org.Id)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
+	err = service.UpadatePredialysisEvaluation(&evaluation)
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.Org.Id,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     3,
+		RecordDate: evaluation.AssessmentDate,
+		Sourse:     1,
+		PatientId:  id,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.Org.Id, evaluation.AssessmentDate, 3, id)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
 	redis := service.RedisClient()
 	defer redis.Close()
@@ -3962,6 +4267,8 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			Remark = remark
 		}
 
+		Startdate := int64(dataBody["record_date"].(float64))
+
 		var advices []*models.GroupAdvice
 		// utils.TraceLog("%+v", dataBody["adviceNames"])
 		if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
@@ -4048,7 +4355,48 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advices = append(advices, &advice)
 		}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= Startdate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, Startdate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		newAdvices, createErr := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, group_no)
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.Org.Id,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: advicedateunix,
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.Org.Id, advicedateunix, 4, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
 		//清空key 值
@@ -4135,6 +4483,29 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				advice.CheckTime = time.Now().Unix()
 			}
 		}
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.RecordDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.RecordDate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err := service.CreateDoctorAdvice(&advice)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
@@ -4273,6 +4644,30 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		advice.UpdatedTime = time.Now().Unix()
 		advice.Modifier = adminUserInfo.AdminUser.Id
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err := service.DeleteDoctorAdvice(&advice)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
@@ -4335,7 +4730,30 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 		var err error
 		if groupno > 0 {
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
 
+				if cha_time >= advice.AdviceDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
@@ -4347,7 +4765,30 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
 		} else {
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 {
+
+				var cha_time int64
 
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= advice.AdviceDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
@@ -4549,7 +4990,30 @@ func (c *PatientApiController) ExecProject() {
 	project.ExecutionStaff = adminInfo.AdminUser.Id
 	project.ExecutionTime = theTime.Unix()
 	if team_id == 0 {
+		// 查询信息规挡的设置天数
 
+		infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= project.RecordDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err := service.SaveHisProject(&project)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -4562,7 +5026,30 @@ func (c *PatientApiController) ExecProject() {
 		}
 	} else {
 		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= project.RecordDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err := service.SaveHisProject(&project)
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -4574,6 +5061,30 @@ func (c *PatientApiController) ExecProject() {
 
 			}
 		} else {
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= project.RecordDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
 			var ids []int64
 			for _, items := range ps {
@@ -4615,6 +5126,30 @@ func (c *PatientApiController) CheckProject() {
 	project.CheckTime = time.Now().Unix()
 	project.CheckState = 1
 	if team_id == 0 {
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= project.RecordDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		err := service.SaveHisProject(&project)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -4630,6 +5165,30 @@ func (c *PatientApiController) CheckProject() {
 
 	} else {
 		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= project.RecordDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			err := service.SaveHisProject(&project)
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -4644,6 +5203,30 @@ func (c *PatientApiController) CheckProject() {
 			}
 
 		} else {
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(project.RecordDate)
+			if infor.ID > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= project.RecordDate {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
 			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
 			var ids []int64
 			for _, items := range ps {

controllers/patient_api_controller.go

@@ -1303,6 +1303,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	}
 	adviceNames := dataBody["adviceNames"].([]interface{})
 	for _, adviceNameMap := range adviceNames {
+
 		adviceNameM := adviceNameMap.(map[string]interface{})
 		var advice models.GroupAdvice
 		advice.Remark = Remark
@@ -1320,6 +1321,50 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.PatientId = patientInfo.ID
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 		advice.IsSettle = 2
+
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: advice.RecordDate,
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, advice.RecordDate, 4, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
+
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1669,6 +1714,31 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	advice.PatientId = patient
 	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= advice.AdviceDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	if advice.UserOrgId == 3877 || advice.UserOrgId == 10340 || advice.UserOrgId == 9671 {
 		if advice.PrescribingNumber == 0 {
 			advice.PrescribingNumber = 1
@@ -1683,6 +1753,23 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 		}
 	}
 	err := service.CreateDoctorAdvice(&advice)
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     4,
+		RecordDate: advice.AdviceDate,
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, advice.AdviceDate, 4, patient)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 	redis := service.RedisClient()
 	defer redis.Close()
@@ -1962,6 +2049,31 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			ExecutionTime:  theTime.Unix(),
 			UpdatedTime:    time.Now().Unix(),
 		}
+
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		if advice.ParentId > 0 {
 			err = service.ExceDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
@@ -2728,6 +2840,30 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			UpdatedTime: time.Now().Unix(),
 		}
 		var err error
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= advice.AdviceDate {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		if advice.ParentId > 0 {
 			err = service.CheckDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
@@ -2919,6 +3055,31 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	advice.UpdatedTime = time.Now().Unix()
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= advice.AdviceDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	err := service.UpdateDoctorAdvice(&advice)
 	redis := service.RedisClient()
 
@@ -3131,6 +3292,30 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 	advice.Status = 0
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= advice.AdviceDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
 	err := service.DeleteDoctorAdvice(&advice)
 	redis := service.RedisClient()
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
@@ -3178,6 +3363,31 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	//	}
 	//}
 
+	// 查询信息规挡的设置天数
+
+	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+	if infor.ID > 0 {
+
+		var cha_time int64
+
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+		//今日的日期减去设置的日期
+		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+		if cha_time >= advice.AdviceDate {
+			//查询审核是否允许
+			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			//申请状态不允许的情况 拒绝修改
+			if infor.ApplicationStatus != 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+				return
+			}
+
+		}
+	}
+
 	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
 
 	key := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"

controllers/supply_order_api_contorller.go

@@ -2403,7 +2403,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 			sum_in_count += item.WarehousingCount
 		}
 		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-		fmt.Println("入库数量23333333333333333333333wo", item.WarehousingCount)
+
 		//查询是否有该耗材
 		goodStock, _ := service.GetGoodSumCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
 		if goodStock.ID > 0 {

enums/error_code.go

@@ -277,6 +277,8 @@ const ( // ErrorCode
 	ErrorCodeSyncWrong = 60000006
 
 	AdviceCodeParamWrong = 600000007
+
+	ErrorCodeInformationExist = 600000008
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -536,6 +538,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodePatientScheduleRepeat:        "一天只能存在一次排班",
 	ErrorCodeDelScheduleFailByDialysisTwo: "已经上机透析，不能操作排班",
 	AdviceCodeParamWrong:                  "医嘱核对人和执行人不能为同一人,请更换第二核对人!",
+
+	ErrorCodeInformationExist: "已经超过归档天数,不予编辑,请提交申请",
 }
 
 type SGJError struct {

go.mod

@@ -3,28 +3,33 @@ module XT_New
 go 1.19
 
 require (
-	github.com/astaxie/beego v1.12.3 // indirect
+	github.com/astaxie/beego v1.12.3
+	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/jinzhu/gorm v1.9.16
+	github.com/robfig/cron v1.2.0
+	github.com/shopspring/decimal v1.3.1
+	golang.org/x/sync v0.1.0
+)
+
+require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/go-redis/redis v6.15.9+incompatible // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/jinzhu/gorm v1.9.16 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.7.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.10.0 // indirect
 	github.com/prometheus/procfs v0.1.3 // indirect
-	github.com/robfig/cron v1.2.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
+	github.com/stretchr/testify v1.8.2 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect
 )

go.sum

@@ -24,13 +24,18 @@ github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
+github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
@@ -46,6 +51,7 @@ github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -55,22 +61,27 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
 github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -80,10 +91,14 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
+github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -92,9 +107,12 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
+github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -102,6 +120,7 @@ github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHu
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -132,9 +151,15 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
@@ -143,22 +168,20 @@ github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29Xrm
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -174,28 +197,32 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -203,3 +230,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

models/data_models.go

@@ -143,16 +143,17 @@ func (DictConfigViewModel) TableName() string {
 }
 
 type FiledConfig struct {
-	ID          int64  `gorm:"column:id" json:"id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
-	Module      int64  `gorm:"column:module" json:"module"`
-	FiledName   string `gorm:"column:filed_name" json:"filed_name"`
-	FiledNameCn string `gorm:"column:filed_name_cn" json:"filed_name_cn"`
-	IsShow      int64  `gorm:"column:is_show" json:"is_show"`
-	CreateTime  int64  `gorm:"column:create_time" json:"create_time"`
-	UpdateTime  int64  `gorm:"column:update_time" json:"update_time"`
-	SysModule   int64  `gorm:"column:sys_module" json:"sys_module" form:"sys_module"`
-	IsWrite     int64  `gorm:"column:is_write" json:"is_write" form:"is_write"`
+	ID           int64  `gorm:"column:id" json:"id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id"`
+	Module       int64  `gorm:"column:module" json:"module"`
+	FiledName    string `gorm:"column:filed_name" json:"filed_name"`
+	FiledNameCn  string `gorm:"column:filed_name_cn" json:"filed_name_cn"`
+	IsShow       int64  `gorm:"column:is_show" json:"is_show"`
+	CreateTime   int64  `gorm:"column:create_time" json:"create_time"`
+	UpdateTime   int64  `gorm:"column:update_time" json:"update_time"`
+	SysModule    int64  `gorm:"column:sys_module" json:"sys_module" form:"sys_module"`
+	IsWrite      int64  `gorm:"column:is_write" json:"is_write" form:"is_write"`
+	IsSecondMenu int64  `gorm:"column:is_second_menu" json:"is_second_menu" form:"is_second_menu"`
 }
 
 func (FiledConfig) TableName() string {

models/device_models.go

@@ -1443,3 +1443,25 @@ func (XtNewObjectDisinfect) TableName() string {
 
 	return "xt_new_object_disinfect"
 }
+
+type XtDialysisInformation struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	Module            int64  `gorm:"column:module" json:"module" form:"module"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ApplicationDate   int64  `gorm:"column:application_date" json:"application_date" form:"application_date"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	ApplicationStatus int64  `gorm:"column:application_status" json:"application_status" form:"application_status"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime         int64  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisInformation) TableName() string {
+
+	return "xt_dialysis_information"
+}

models/dialysis.go

@@ -1482,18 +1482,18 @@ func (NewAssessmentAfterDislysis) TableName() string {
 	return "xt_assessment_after_dislysis"
 }
 
-type XtDialysisInformaitonSetting struct {
-	ID        int64 `gorm:"column:id" json:"id" form:"id"`
-	WeekDay   int64 `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status    int64 `gorm:"column:status" json:"status" form:"status"`
-	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-}
-
-func (XtDialysisInformaitonSetting) TableName() string {
-	return "xt_dialysis_informaiton_setting"
-}
+//type XtDialysisInformaitonSetting struct {
+//	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+//	WeekDay   int64 `gorm:"column:week_day" json:"week_day" form:"week_day"`
+//	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+//	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+//	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+//	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+//}
+//
+//func (XtDialysisInformaitonSetting) TableName() string {
+//	return "xt_dialysis_informaiton_setting"
+//}
 
 type DialysisInformation struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
@@ -1530,11 +1530,11 @@ type DialysisScheduleFlow struct {
 	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 
-	MonitorPatients *MonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
-	DeviceNumber    *DeviceNumber    `gorm:"ForeignKey:BedId" json:"device_number"`
-	DeviceZone      *DeviceZone      `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	TreatmentMode   *TreatmentMode   `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
-	DialysisFinish  *DialysisFinish  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"dialysis_finish"`
+	MonitorPatients *MonitorPatients  `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    *DeviceNumber     `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      *DeviceZone       `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   *TreatmentMode    `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+	DialysisFinish  []*DialysisFinish `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"dialysis_finish"`
 }
 
 func (DialysisScheduleFlow) TableName() string {

models/patient_models.go

@@ -1833,6 +1833,36 @@ func (XtPatientFirstDisease) TableName() string {
 	return "xt_patient_first_disease"
 }
 
+type XtDialysisFinish struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	IsFinish   int64 `gorm:"column:is_finish" json:"is_finish" form:"is_finish"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Module     int64 `gorm:"column:module" json:"module" form:"module"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Sourse     int64 `gorm:"column:sourse" json:"sourse" form:"sourse"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (XtDialysisFinish) TableName() string {
+	return "xt_dialysis_finish"
+}
+
+type XtDialysisInformaitonSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	WeekDay   int64 `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisInformaitonSetting) TableName() string {
+	return "xt_dialysis_informaiton_setting"
+}
+
 type XtPatientSickHistory struct {
 	ID                      int64                  `gorm:"column:id" json:"id" form:"id"`
 	OrgId                   int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`

service/dialysis_service.go

@@ -2102,6 +2102,53 @@ func UpdateLastMonitorRecordToday(accumulated_blood_volume float64, id int64) er
 	return err
 }
 
+func GetDialysisFinish(user_org_id int64, record_date int64, module int64, patient_id int64) (models.XtDialysisFinish, error) {
+
+	finish := models.XtDialysisFinish{}
+
+	err := XTReadDB().Where("user_org_id = ? and record_date = ? and status =1 and module = ? and patient_id = ?", user_org_id, record_date, module, patient_id).Find(&finish).Error
+	return finish, err
+}
+
+func CreateDialysisFinish(finish models.XtDialysisFinish) error {
+
+	err := XTWriteDB().Create(&finish).Error
+
+	return err
+}
+
+func GetDialysisInformationSetting(user_org_id int64) (models.XtDialysisInformaitonSetting, error) {
+
+	setting := models.XtDialysisInformaitonSetting{}
+
+	err := XTReadDB().Where("user_org_id =? and status = 1", user_org_id).Find(&setting).Error
+
+	return setting, err
+
+}
+
+func CreatedDialysisInformation(information models.XtDialysisInformation) error {
+
+	err := XTWriteDB().Create(&information).Error
+
+	return err
+}
+
+func GetDialysisInoformationById(patient_id int64, record_date int64, user_org_id int64, module int64) (models.XtDialysisInformation, error) {
+
+	information := models.XtDialysisInformation{}
+	err := XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and module = ? and status = 1", patient_id, record_date, user_org_id, module).Find(&information).Error
+	return information, err
+}
+
+func UpdateDialysisInformationById(patient_id int64, record_date int64, user_org_id int64, module int64, advice_date int64, remark string) error {
+
+	information := models.XtDialysisInformation{}
+
+	err := XTWriteDB().Model(&information).Where("patient_id = ? and record_date = ? and user_org_id  =? and module = ? and status=1", patient_id, record_date, user_org_id, module).Update(map[string]interface{}{"application_date": advice_date, "remark": remark}).Error
+	return err
+}
+
 func UpdateDoctorAdviceByExcecute(id int64, user_org_id int64) error {
 
 	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"execution_time": 0, "execution_staff": 0, "execution_state": 2}).Error
@@ -2130,7 +2177,7 @@ func GetInformationSettingByOrgId(user_org_id int64) (models.XtDialysisInformait
 	return setting, err
 }
 
-func GetDialysisInformationSetting(user_org_id int64) (infor []*models.XtDialysisInformaitonSetting, err error) {
+func GetDialysisInformationSettingList(user_org_id int64) (infor []*models.XtDialysisInformaitonSetting, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&infor).Error
 
@@ -2150,6 +2197,19 @@ func GetDialysisInformationIsNoCheck(user_org_id int64, limit int64, page int64,
 	return infor, total, err
 }
 
+func GetDialysisInformationIsNoCheckOne(user_org_id int64, limit int64, page int64, application_status int64) (infor []*models.DialysisInformation, total int64, err error) {
+
+	db := XTReadDB().Model(&infor).Where("status= 1")
+	if application_status > 0 {
+		db = db.Where("application_status = ? or application_status= 3", application_status)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Find(&infor).Error
+	return infor, total, err
+}
+
 func CheckDialysisInformation(id int64, application_status int64, timenow int64, checker int64) (models.DialysisInformation, error) {
 
 	information := models.DialysisInformation{}

service/gobal_config_service.go

@@ -1061,3 +1061,61 @@ func GetLastAfter(patient_id int64, schedule_date int64, user_org_id int64) (mod
 	err := XTReadDB().Where("patient_id = ? and assessment_date = ? and user_org_id =? and status= 1", patient_id, schedule_date, user_org_id).Find(&dislysis).Error
 	return dislysis, err
 }
+
+func GetDialysisInformationByRecordDate(patient_id int64, record_date int64, user_org_id int64) (models.XtDialysisInformation, error) {
+
+	information := models.XtDialysisInformation{}
+	err := XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&information).Error
+	return information, err
+}
+
+func SaveDialysisInformation(information models.XtDialysisInformation) error {
+
+	err := XTWriteDB().Create(&information).Error
+
+	return err
+}
+
+func UpdateInformationByRecordDate(patient_id int64, record_date int64, user_org_id int64, application_date int64, remark string) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisInformation{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status = 1", patient_id, record_date, user_org_id).Update(map[string]interface{}{"application_status": 2, "application_date": application_date, "remark": remark}).Error
+	return err
+}
+
+func GetMobileInformation(limit int64, page int64, application_status int64, orgid int64) (infor []*models.XtDialysisInformation, total int64, err error) {
+
+	db := XTReadDB().Model(&infor).Where("status=1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	if application_status > 0 {
+		db = db.Where("application_status = ?", application_status)
+	}
+
+	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("ctime desc").Find(&infor).Error
+
+	return infor, total, err
+
+}
+
+func GetMobileInformationOne(limit int64, page int64, orgid int64) (infor []*models.XtDialysisInformation, total int64, err error) {
+
+	db := XTReadDB().Model(&infor).Where("status=1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("ctime desc").Find(&infor).Error
+
+	return infor, total, err
+
+}
+
+func CheckMobileInformation(id int64, application_status int64, checker int64, checker_time int64) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisInformation{}).Where("id = ? and status= 1", id).Update(map[string]interface{}{"application_status": application_status, "checker": checker, "check_time": checker_time}).Error
+	return err
+}

service/warhouse_service.go

@@ -1865,7 +1865,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		if errThree != nil {
 			return errThree
 		}
-		fmt.Println("errThreee23333333333333333333333", errThree)
+
 		//查询剩余库存
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		goodList, _ := GetAllGoodSumCount(good_yc.GoodId, orgID, houseConfig.StorehouseOutInfo)
@@ -1873,7 +1873,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		for _, item := range goodList {
 			sum_count += item.StockCount
 		}
-		fmt.Println("sum_count++++++++++++++++++++++++++++++++=", sum_count)
+
 		// 判断当前出库的数据和删除出库数量
 		if good_yc.Count <= ware.Count {
 			delete_count = good_yc.Count