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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10394 //机构id
+		subscibe.OrgId = 9671 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10394 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3295  //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15993 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10394 //机构id小英9675或4
+		subscibe.OrgId = 9671 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10394 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3295  //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15993 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" || module == "sick_history" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" || module == "sick_history" || module == "befor_symptoms" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -112,9 +112,15 @@ 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")
+
+	beego.Router("/api/patient/checkdialysisinformation", &DialysisApiController{}, "Get:CheckDialysisInformation")
+
+	beego.Router("/api/dialysis/patientsflow", &DialysisApiController{}, "Get:GetDialysisPatientsFlow")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -339,6 +345,7 @@ func (c *DialysisApiController) PostPrescription() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -456,6 +463,7 @@ func (c *DialysisApiController) PostPrescription() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -612,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 值
@@ -640,6 +691,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 	} else { //修改
 		if mode_id > 0 {
+
 			var str string
 			//查找该机构用的是什么透析器
 			filedConfig, _ := service.GetFiledConfig(adminUserInfo.CurrentOrgId)
@@ -683,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)
 
 		//修改处方
@@ -855,6 +932,7 @@ func (c *DialysisApiController) PostSoulution() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -895,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,
@@ -998,6 +1100,7 @@ func (c *DialysisApiController) PostSoulution() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1064,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 {
@@ -1178,6 +1299,7 @@ func (c *DialysisApiController) PostSoulution() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescribing_number,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//针对河间咸得
@@ -1446,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
@@ -1454,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"
 
@@ -1585,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 值
@@ -1767,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 值
@@ -1791,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 值
@@ -1911,6 +2184,23 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	his_department := c.GetString("his_department")
 	his_bed := c.GetString("his_bed")
 	point_puncture := c.GetString("point_puncture")
+
+	catheter_evaluation_program := c.GetString("catheter_evaluation_program")
+	skin_site_catheterization := c.GetString("skin_site_catheterization")
+	pathway_formation_time := c.GetString("pathway_formation_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(pathway_formation_time) > 0 {
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", pathway_formation_time+" 00:00:00", loc)
+		startTime = theTime.Unix()
+	}
+	whether_unobstructed, _ := c.GetInt64("whether_unobstructed")
+
+	lien_necessary, _ := c.GetInt64("lien_necessary")
+
+	befor_symptoms := c.GetString("befor_symptoms")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1985,6 +2275,12 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		HisDepartment:                  his_department,
 		HisBed:                         his_bed,
 		PointPuncture:                  point_puncture,
+		CatheterEvaluationProgram:      catheter_evaluation_program,
+		SkinSiteCatheterization:        skin_site_catheterization,
+		PathwayFormationTime:           startTime,
+		WhetherUnobstructed:            whether_unobstructed,
+		LienNecessary:                  lien_necessary,
+		BeforSymptoms:                  befor_symptoms,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1999,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
@@ -2451,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()
@@ -2529,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"
@@ -3059,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 值
@@ -3181,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"
 
@@ -3579,6 +4049,11 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	project_config, _ := service.GetHisProjectConfig(adminUserInfo.CurrentOrgId)
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	//获取诊断
+	prescriptionInfo, _ := service.GetPrescriptionInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	patientDiagnose, _ := service.FindPatientDianose(adminUserInfo.CurrentOrgId)
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -3634,6 +4109,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"last_order":                lastOrder,
 			"project_config":            project_config,
 			"projects":                  projects,
+			"prescriptionInfo":          prescriptionInfo,
+			"patientDiagnose":           patientDiagnose,
 		})
 
 	}
@@ -3671,6 +4148,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"last_order":                lastOrder,
 			"project_config":            project_config,
 			"projects":                  projects,
+			"prescriptionInfo":          prescriptionInfo,
+			"patientDiagnose":           patientDiagnose,
 		})
 	}
 
@@ -4035,10 +4514,12 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		return
 	}
 	theTimeUnix, err := time.ParseInLocation(timeLayout, startTime, loc)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		return
-	}
+
+	fmt.Println("theTimeUnix", theTimeUnix.Unix())
+	//if err != nil {
+	//	utils.ErrorLog(err.Error())
+	//	return
+	//}
 	StartTime := theTimeUnix.Unix()
 	fmt.Println("startTIME", StartTime)
 	Remark := ""
@@ -4058,7 +4539,11 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		var advice models.GroupAdvice
 		advice.Remark = Remark
 		advice.AdviceType = adviceType
+
 		advice.StartTime = StartTime
+		if StartTime < 0 {
+			advice.StartTime = time.Now().Unix()
+		}
 		advice.AdviceDate = AdviceDate
 
 		advice.RecordDate = RecordDate
@@ -4271,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"
@@ -6147,10 +6650,134 @@ func (this *DialysisApiController) GetDialysisInformationSetting() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	informationSetting, _ := service.GetDialysisInformationSetting(orgId)
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	informationSetting, _ := service.GetDialysisInformationSettingList(orgId)
+
+	//未审核
+	infor, total, _ := service.GetDialysisInformationIsNoCheck(orgId, limit, page, 2)
+
+	//全部
+	inforList, totalOne, _ := service.GetDialysisInformationIsNoCheckOne(orgId, limit, page, 1)
+
+	patients, _ := service.GetAllpatientThirty(orgId)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	role, _ := service.GetAllDoctorListSix(orgId, appId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"informaitonSetting": informationSetting,
+		"infor":              infor,
+		"total":              total,
+		"totalOne":           totalOne,
+		"inforList":          inforList,
+		"patients":           patients,
+		"adminList":          role,
 	})
 	return
 }
+
+func (this *DialysisApiController) CheckDialysisInformation() {
+
+	id, _ := this.GetInt64("id")
+	application_status, _ := this.GetInt64("application_status")
+	timeNow := time.Now().Unix()
+	checker := this.GetAdminUserInfo().AdminUser.Id
+	information, _ := service.CheckDialysisInformation(id, application_status, timeNow, checker)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetDialysisPatientsFlow() {
+
+	page, _ := this.GetInt64("page", 1)
+	limit, _ := this.GetInt64("limit", 10)
+	schedulType, _ := this.GetInt64("schedul_type", 0)
+	startTime, _ := this.GetInt64("schedul_time", 0)
+	partitionType, _ := this.GetInt64("partition_type", 0)
+	keywords := this.GetString("keywords")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+	if len(keywords) > 0 {
+
+		dialysisSchedule, err, total := service.GetDialysisWatchByKeywordFlow(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": dialysisSchedule,
+				"total":    total,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		}
+
+	} else {
+		dialysisSchedule, err, total := service.GetDialysisWatchFlow(adminUserInfo.CurrentOrgId, startTime/1000, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
+		fmt.Println("dialysisSchedule-----------------------", dialysisSchedule)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": dialysisSchedule,
+				"total":    total,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		}
+	}
+}
+
+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/drug_stock_api_contorller.go

@@ -3538,8 +3538,10 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 	warehousing_id, _ := c.GetInt64("warehousing_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	checker := c.GetAdminUserInfo().AdminUser.Id
 	//更改核对状态
-	err := service.CheckWarehousingInfo(warehousing_id, orgId)
+	err := service.CheckWarehousingInfo(warehousing_id, orgId, checker)
 
 	if err == nil {
 		list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)

controllers/his_api_controller.go

@@ -1461,6 +1461,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
+		patientDiagnose, _ := service.FindPatientDianose(adminInfo.CurrentOrgId)
 		//获取是否开启保存耗材出库的开关
 		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1475,6 +1476,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
 			"goodOutOpen":      goodOutOpen,
+			"patientDiagnose":  patientDiagnose,
 		})
 	}
 	if adminInfo.CurrentOrgId != 9675 && adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10215 {
@@ -1507,7 +1509,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 		//获取是否开启保存耗材出库的开关
 		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
-
+		patientDiagnose, _ := service.FindPatientDianose(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
 			"advices_template": advices,
@@ -1520,6 +1522,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
 			"goodOutOpen":      goodOutOpen,
+			"patientDiagnose":  patientDiagnose,
 		})
 	}
 }
@@ -1536,6 +1539,8 @@ func (c *HisApiController) CreateHisPrescription() {
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
 	p_type, _ := c.GetInt64("p_type")
+	patient_diagnose := c.GetString("patient_diagnose")
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -2628,6 +2633,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
 			PType:              p_type,
+			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 		redis := service.RedisClient()
@@ -2660,6 +2666,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			SickType:           sick_type,
 			PType:              info.PType,
 			HisPatientId:       info.HisPatientId,
+			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 		redis := service.RedisClient()
@@ -3004,6 +3011,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 		//查询今日该患者开的药品处方
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
+
+		fmt.Println("今日出库2333333333333333333333333333333333333333")
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 		//药品出库
 		if drugOutConfig.IsOpen == 1 {
@@ -3012,7 +3021,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
-
+				fmt.Println("今日最后出库2333333333333333333333333333333333333333", druginfo)
 				if len(druginfo) > 0 {
 					//回退库存
 					for _, it := range druginfo {
@@ -3023,6 +3032,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 						}
 						if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
 							service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
 
 						}

controllers/manage_api_controller.go

@@ -957,16 +957,16 @@ func (this *MachineApiController) GetPatient() {
 func (this *MachineApiController) GetAllOrganization() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	//fmt.Println("orgid", orgid)
 	appid := adminUserInfo.CurrentAppId
-	//fmt.Println("appid", appid)
 	approle, err := service.GetAllOrganization(orgid, appid)
+	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"approle": approle,
+		"approle":   approle,
+		"operators": operators,
 	})
 }
 
@@ -2670,7 +2670,6 @@ func (this *MachineApiController) GetBedForm() {
 	fmt.Println("id", id)
 	addmacher, err := service.GetZoneForm(id)
 	bed, err := service.GetZoneId(addmacher.BedId, orgId)
-	fmt.Println("bed--------------------", bed.ZoneID)
 	number, err := service.GetBedForm(bed.ZoneID)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")

controllers/manager_center_api_controller.go

@@ -83,6 +83,11 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/drug/getalldruglist", &ManagerCenterApiController{}, "get:GetAllDrugList")
 	beego.Router("/api/drug/postsearchdruglist", &ManagerCenterApiController{}, "get:GetSearchDrugList")
 
+	beego.Router("/api/patient/addpatientdiagnose", &ManagerCenterApiController{}, "Post:AddPatientDiagnos")
+	beego.Router("/api/patient/getpatientdiagnose", &ManagerCenterApiController{}, "Get:GetPatientDiagnose")
+	beego.Router("/api/patient/getpatientdiagnosedetail", &ManagerCenterApiController{}, "Get:GetPatientDiagnoseDetail")
+	beego.Router("/api/patient/updatepatientcase", &ManagerCenterApiController{}, "Post:UpdatePatientCase")
+	beego.Router("/api/patient/deletepatientdiagnose", &ManagerCenterApiController{}, "Get:DeletePatientDiagnose")
 }
 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
@@ -825,7 +830,7 @@ func (c *ManagerCenterApiController) UpdateChildConfig() {
 	dataconfig.Remark = string(dataBody["remark"].(string))
 	dataconfig.Order = int64(dataBody["orders"].(float64))
 	dataconfig.Code = string(dataBody["code"].(string))
-	fmt.Println("dataconfitg------", dataconfig.Order)
+
 	//if dataBody["orders"] != nil {
 	//	dataconfig.Order = int64(dataBody["orders"].(float64))
 	//	fmt.Println("dataconfig",dataconfig.Order)
@@ -2314,3 +2319,98 @@ func (c *ManagerCenterApiController) GetSearchDrugList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) AddPatientDiagnos() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+
+	class_name := dataBody["class_name"].(string)
+	sort := int64(dataBody["sort"].(float64))
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	diagnose := models.XtPatientDiagnose{
+		ClassName: class_name,
+		Sort:      sort,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+	}
+
+	err = service.CreatePatientDiagnose(diagnose)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"diagnose": diagnose,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetPatientDiagnose() {
+
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, total, err := service.GetPatientDiagnose(limit, page, orgId)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetPatientDiagnoseDetail() {
+
+	id, _ := c.GetInt64("id")
+
+	detail, err := service.GetPatientDiagnoseDetail(id)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"detail": detail,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) UpdatePatientCase() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+
+	class_name := dataBody["class_name"].(string)
+	sort := int64(dataBody["sort"].(float64))
+
+	id := int64(dataBody["id"].(float64))
+
+	err = service.UpdatePatientCase(class_name, sort, id)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "msg",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) DeletePatientDiagnose() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeletePatientDiagnose(id)
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	c.ServeSuccessJSON(returnData)
+	return
+}

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

@@ -143,19 +143,23 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//redis key值
 			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
+			fmt.Println("ket--------------------", key)
+
+			redis.Set(key, "", time.Second)
 			purviews_json_str, _ := redis.Get(key).Result()
 			//获取该用户下所有角色的权限总集
 			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 结束----")
 
 			if len(purviews_json_str) == 0 {
 				for _, item := range roles {
 					role_id, _ := strconv.ParseInt(item, 10, 64)
 					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+
 					if len(userRolePurviews) == 0 {
 						userRolePurviews = purviews
 					} else {
@@ -183,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
@@ -619,7 +690,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			UpdatedTime:    time.Now().Unix(),
 		}
 		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()
@@ -642,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()
@@ -1132,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{
@@ -1445,7 +1591,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					//
-					//if config.IsOpen == 1 && item.UserOrgId == 10088 {
+					//if config.IsOpen == 1 && item.UserOrgId == 10188 {
 					//
 					//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 					//	//更新字典里面的库存
@@ -1556,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"
@@ -1567,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)
@@ -1637,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
@@ -1707,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()
@@ -1733,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()
@@ -1783,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"
@@ -2384,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()
@@ -3071,6 +3377,49 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.PointPuncture = point_puncture
 	}
+
+	if dataBody["catheter_evaluation_program"] != nil && reflect.TypeOf(dataBody["catheter_evaluation_program"]).String() == "string" {
+		catheter_evaluation_program := dataBody["catheter_evaluation_program"].(string)
+
+		evaluation.CatheterEvaluationProgram = catheter_evaluation_program
+	}
+
+	if dataBody["skin_site_catheterization"] != nil && reflect.TypeOf(dataBody["skin_site_catheterization"]).String() == "string" {
+		skin_site_catheterization := dataBody["skin_site_catheterization"].(string)
+
+		evaluation.SkinSiteCatheterization = skin_site_catheterization
+	}
+
+	if dataBody["whether_unobstructed"] != nil && reflect.TypeOf(dataBody["whether_unobstructed"]).String() == "float64" {
+		whether_unobstructed := int64(dataBody["whether_unobstructed"].(float64))
+		evaluation.WhetherUnobstructed = whether_unobstructed
+	}
+
+	if dataBody["lien_necessary"] != nil && reflect.TypeOf(dataBody["lien_necessary"]).String() == "float64" {
+		lien_necessary := int64(dataBody["lien_necessary"].(float64))
+		evaluation.LienNecessary = lien_necessary
+	}
+
+	if dataBody["pathway_formation_time"] != nil && reflect.TypeOf(dataBody["pathway_formation_time"]).String() == "string" {
+		pathway_formation_time := dataBody["pathway_formation_time"].(string)
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		var startTime int64
+		if len(pathway_formation_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", pathway_formation_time+" 00:00:00", loc)
+
+			startTime = theTime.Unix()
+		}
+
+		evaluation.PathwayFormationTime = startTime
+	}
+
+	if dataBody["befor_symptoms"] != nil && reflect.TypeOf(dataBody["befor_symptoms"]).String() == "string" {
+		befor_symptoms := dataBody["befor_symptoms"].(string)
+		evaluation.BeforSymptoms = befor_symptoms
+
+		fmt.Println("befor_symptomsss23333333333333333333333333", befor_symptoms)
+	}
 	return
 }
 
@@ -3918,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 {}" {
@@ -4004,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 值
@@ -4091,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()
@@ -4229,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"
 
@@ -4291,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"
 
@@ -4303,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"
 
@@ -4505,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{}{
@@ -4518,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{}{
@@ -4530,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 {
@@ -4571,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{}{
@@ -4586,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{}{
@@ -4600,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

@@ -366,6 +366,7 @@ func (c *PatientApiController) CreatePatient() {
 		TrobleShoot:                  patient.TrobleShoot,
 		TreatmentPlan:                patient.TreatmentPlan,
 		Doctor:                       patient.Doctor,
+		RecordNumber:                 patient.RecordNumber,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -582,6 +583,7 @@ func (c *PatientApiController) EditPatient() {
 		TrobleShoot:               patient.TrobleShoot,
 		SchRemark:                 patient.SchRemark,
 		TreatmentPlan:             patient.TreatmentPlan,
+		RecordNumber:              patient.RecordNumber,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -939,6 +941,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			MaxUltrafiltrationRate:     solution.MaxUltrafiltrationRate,
 			Amylaceum:                  solution.Amylaceum,
 			DialysisStrainer:           solution.DialysisStrainer,
+			Chaptalization:             solution.Chaptalization,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -1300,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
@@ -1317,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)
@@ -1666,7 +1714,62 @@ 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
+		}
+		//查询该患者今日有没有双人核对
+		check, _ := service.MobileGetDoubleCheckSix(advice.UserOrgId, patientInfo.ID, advice.AdviceDate)
+
+		if check.ID > 0 {
+			advice.Checker = check.Modifier
+			advice.CheckState = 1
+			advice.CheckTime = time.Now().Unix()
+		}
+	}
 	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()
@@ -1946,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"
@@ -2712,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"
@@ -2903,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()
 
@@ -3115,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"
@@ -3162,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"
@@ -3249,11 +3475,15 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		//相关操作对应的操作人
 		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 
+		//获取长期医嘱
+		longAdvice, _, _ := service.GetLongDoctorAdviceList(adminUserInfo.CurrentOrgId, id, 1, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
 		c.ServeSuccessJSON(map[string]interface{}{
-			"advices":   advices,
-			"operators": operators,
-			"total":     total,
-			"advicetwo": advicestwo,
+			"advices":    advices,
+			"operators":  operators,
+			"total":      total,
+			"advicetwo":  advicestwo,
+			"longAdvice": longAdvice,
+			"is_open":    hisconfig.IsOpen,
 		})
 		return
 	} else {
@@ -3285,6 +3515,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 			"operators": operators,
 			"total":     total,
 			"advicetwo": advicestwo,
+			"is_open":   hisconfig.IsOpen,
 		})
 		return
 	}
@@ -4058,6 +4289,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		amylaceum := dataBody["amylaceum"].(string)
 		solution.Amylaceum = amylaceum
 	}
+
+	if dataBody["chaptalization"] != nil && reflect.TypeOf(dataBody["chaptalization"]).String() == "string" {
+		chaptalization := dataBody["chaptalization"].(string)
+		solution.Chaptalization = chaptalization
+	}
 	return
 }
 
@@ -4669,6 +4905,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		doctor := int64(patientBody["doctor"].(float64))
 		patient.Doctor = doctor
 	}
+
+	if patientBody["record_number"] != nil && reflect.TypeOf(patientBody["record_number"]).String() == "string" {
+		record_number := patientBody["record_number"].(string)
+		patient.RecordNumber = record_number
+	}
 	return
 }
 

controllers/patient_dataconfig_api_controller.go

@@ -36,6 +36,8 @@ func PatientDataConfigAPIControllerRegistRouters() {
 	beego.Router("/api/patient/sickhistory/print", &PatientDataConfigAPIController{}, "get:GetSickhistoryPrints")
 	beego.Router("/api/patient/physiquecheck/print", &PatientDataConfigAPIController{}, "get:GetPhysiquecheckPrints")
 
+	beego.Router("/api/patient/getpatientdialysisinforlist", &PatientDataConfigAPIController{}, "get:GetPatientDialysisInforList")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -1000,7 +1002,6 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 	//loc, _ := time.LoadLocation("Local")
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
-	fmt.Println("checkDate--------------", checkDate)
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
 	if getPatientErr != nil {
@@ -1038,3 +1039,54 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 		"record": record,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetPatientDialysisInforList() {
+
+	patientID, _ := this.GetInt64("patient_id")
+	record_date := this.GetString("record_date")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	fmt.Println("startTime0000000000000000", startTime)
+
+	//获取患者姓名
+	patient, _ := service.GetPatientName(patientID)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取透析处方
+	prescription, _ := service.GetDialysisPrescription(patientID, orgId, startTime)
+
+	//获取透前评估
+	assessmentBefor, _ := service.GetAssessmentBefor(orgId, patientID, startTime)
+
+	//透析上机
+	order, _ := service.GetDialysisOrder(orgId, patientID, startTime)
+
+	//透析监测
+	monitor, _ := service.GetFistMonitorSix(orgId, patientID, startTime)
+
+	//透析医嘱
+	advice, _ := service.GetBloodDoctorAdvice(startTime, orgId, patientID)
+
+	//透后评估
+	afterDislysis, _ := service.GetAssessmentAfterDissData(patientID, orgId, startTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":         patient,
+		"prescription":    prescription,
+		"assessmentBefor": assessmentBefor,
+		"order":           order,
+		"monitor":         monitor,
+		"advice":          advice,
+		"afterDislysis":   afterDislysis,
+	})
+}

controllers/pharmacy_controller.go

@@ -438,7 +438,7 @@ func (this *PharmacyController) DispensingMedicine() {
 
 // 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
-	fmt.Println("寄哪里2333333333333333333333333333333")
+
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -4394,6 +4394,18 @@ func (c *ScheduleApiController) GetScheduleOne() {
 		weekEndPoint = theEndTime.Unix()
 	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+
+	if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10346 {
+
+		if len(schdules) > 0 {
+			//获取长期医嘱里面的透析器灌流器
+			for _, item := range schdules {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, solution.DialyzerPerfusionApparatus, item.ScheduleType)
+			}
+
+		}
+	}
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,
@@ -4408,6 +4420,8 @@ func (c *ScheduleApiController) GetScheduleOne() {
 func (c *ScheduleApiController) GetScheduleTwo() {
 
 	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+
+	fmt.Println("weekwoowowowowowowowowowo", week)
 	patitionIdStr := c.GetString("patitionid")
 
 	ids := strings.Split(patitionIdStr, ",")
@@ -4416,6 +4430,7 @@ func (c *ScheduleApiController) GetScheduleTwo() {
 
 	adminInfo := c.GetAdminUserInfo()
 	weekDateStr := c.GetString("week_date")
+	fmt.Println("weekDateStr--------------------", weekDateStr)
 	WeekDayIds := strings.Split(weekDateStr, ",")
 
 	thisTime := time.Now()

controllers/stock_in_api_controller.go

@@ -7433,8 +7433,9 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	//查询默认仓库
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
+	checker := this.GetAdminUserInfo().AdminUser.Id
 	//更改审核状态
-	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
+	err := service.UpdateCheckWarehouseInfo(warehousing_info_id, checker)
 	if err == nil {
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 

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 {
@@ -192,3 +193,17 @@ type XtHisAddtionConfig struct {
 func (XtHisAddtionConfig) TableName() string {
 	return "xt_his_addtion_config"
 }
+
+type XtPatientDiagnose struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	ClassName string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	Sort      int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	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 (XtPatientDiagnose) TableName() string {
+	return "xt_patient_diagnose"
+}

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

@@ -160,6 +160,7 @@ type SchedualPatient2 struct {
 	UserSysBeforeCount        int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                 string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	HospitalFirstDialysisDate int64                `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	RecordNumber              string               `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -326,6 +327,12 @@ type PredialysisEvaluation struct {
 	HisDepartment                  string  `gorm:"column:his_department" json:"his_department" form:"his_department"`
 	HisBed                         string  `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
 	PointPuncture                  string  `gorm:"column:point_puncture" json:"point_puncture" form:"point_puncture"`
+	CatheterEvaluationProgram      string  `gorm:"column:catheter_evaluation_program" json:"catheter_evaluation_program" form:"catheter_evaluation_program"`
+	SkinSiteCatheterization        string  `gorm:"column:skin_site_catheterization" json:"skin_site_catheterization" form:"skin_site_catheterization"`
+	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
+	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
+	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
+	BeforSymptoms                  string  `gorm:"column:befor_symptoms" json:"befor_symptoms" form:"befor_symptoms"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -1475,15 +1482,78 @@ 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"`
+//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"`
+	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 (XtDialysisInformaitonSetting) TableName() string {
-	return "xt_dialysis_informaiton_setting"
+func (DialysisInformation) TableName() string {
+	return "xt_dialysis_information"
+}
+
+type DialysisScheduleFlow struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	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"`
+}
+
+func (DialysisScheduleFlow) TableName() string {
+	return "xt_schedule"
+}
+
+type DialysisFinish 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 (DialysisFinish) TableName() string {
+	return "xt_dialysis_finish"
 }

models/drug_stock.go

@@ -19,6 +19,7 @@ type DrugWarehouse struct {
 	SecondWarehouseId int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (DrugWarehouse) TableName() string {

models/his_models.go

@@ -422,6 +422,7 @@ type HisPrescriptionInfo struct {
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType              int64           `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PatientDiagnosis   string          `gorm:"column:patient_diagnosis" json:"patient_diagnosis" form:"patient_diagnosis"`
 }
 
 func (HisPrescriptionInfo) TableName() string {

models/patient_models.go

@@ -221,6 +221,7 @@ type Patients struct {
 	ZbPatientId              string  `gorm:"column:zb_patient_id" json:"zb_patient_id" form:"zb_patient_id"`
 	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (Patients) TableName() string {
@@ -366,6 +367,7 @@ type DialysisPrescription struct {
 	SodiumBicarbonateFlow      string        `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
 	PrescriptionWater          float64       `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 	DialysisStrainer           string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	Chaptalization             string        `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -583,6 +585,7 @@ type DialysisSolution struct {
 	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
 	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	Chaptalization             string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
 }
 
 func (DialysisSolution) TableName() string {
@@ -810,6 +813,7 @@ type XtPatientsNew struct {
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -1602,6 +1606,7 @@ type VmDialysisSolutionOne struct {
 	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
 	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	SolutionStatus             int64  `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
 }
 
 func (VmDialysisSolutionOne) TableName() string {
@@ -1634,6 +1639,7 @@ type XtScheduleList struct {
 	ModeId           int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	IsExport         int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
 	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+	Status           int64              `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (XtScheduleList) TableName() string {
@@ -1827,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"`

models/schedule_models.go

@@ -74,9 +74,10 @@ type ScheduleTwo struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
-	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
-	DialysisMachineName       string               `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Patient                   string                `gorm:"-" json:"patient" form:"patient"`
+	PatientInfectiousDiseases []InfectiousDiseases  `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisMachineName       string                `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	DialysisSolution          VmDialysisSolutionOne `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 }
 
 func (ScheduleTwo) TableName() string {

models/stock_models.go

@@ -69,6 +69,7 @@ type Warehousing struct {
 	IsSys             int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	SecondWarehouseId int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsCheck           int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64        `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (Warehousing) TableName() string {

service/dialysis_service.go

@@ -1640,6 +1640,7 @@ func GetAllPcDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrde
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
+
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
 
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2020,7 +2021,7 @@ func FindAllDoctorAdviceByIds(orgID int64, ids []string) (advice []models.Doctor
 }
 
 func ExectionBloodMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
-	fmt.Println("ids2323232323323223233223wode", ids)
+
 	advice := models.DoctorAdviceThrity{}
 	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
 	return err
@@ -2101,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
@@ -2129,9 +2177,128 @@ 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
 
 	return infor, err
 }
+
+func GetDialysisInformationIsNoCheck(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 = ?", 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 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{}
+
+	err := XTWriteDB().Model(&information).Where("id=? and status = 1", id).Updates(map[string]interface{}{"application_status": application_status, "check_time": timenow, "checker": checker}).Error
+
+	return information, err
+
+}
+
+func GetDialysisWatchByKeywordFlow(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) ([]*models.DialysisScheduleFlow, error, int64) {
+	var patients []*models.Patients
+	getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
+	if getPatientErr != nil {
+		return nil, getPatientErr, 0
+	}
+	patientIDs := make([]int64, len(patients))
+	for index, patient := range patients {
+		patientIDs[index] = patient.ID
+	}
+
+	db := readDb.Model(&models.DialysisScheduleFlow{})
+	if start > 0 && end > 0 {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date >= ? and record_date<=?", orgID, start, end).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+	} else {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ?", orgID).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+	}
+
+	db = db.Where("xt_schedule.status = 1 AND patient_id in (?)", patientIDs)
+	if schedulType > 0 {
+		db = db.Where("schedule_type = ?", schedulType)
+	}
+	if start > 0 {
+		db = db.Where("schedule_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("schedule_date<=?", end)
+	}
+	if partitionType > 0 {
+		db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ?", partitionType)
+	}
+	var schedules []*models.DialysisScheduleFlow
+	total := int64(0)
+	err := db.Count(&total).Offset(limit * (page - 1)).Limit(limit).Order("schedule_date desc").Find(&schedules).Error
+	return schedules, err, total
+}
+
+func GetDialysisWatchFlow(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) (schedule []*models.DialysisScheduleFlow, err error, total int64) {
+	db := readDb.Model(&models.DialysisScheduleFlow{})
+
+	fmt.Println("schedule_date--------------------", schedulDate)
+	if schedulDate > 0 {
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("TreatmentMode", "status = 1").
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date =?", orgID, schedulDate).
+			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+		db = db.Where("xt_schedule.status = 1")
+		db = db.Where("schedule_date = ?", schedulDate)
+	}
+	if schedulType > 0 {
+		db = db.Where("schedule_type = ?", schedulType)
+	}
+	if start > 0 {
+		db = db.Where("schedule_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("schedule_date <= ?", end)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id = ?", orgID)
+	}
+	if partitionType > 0 {
+		db = db.Joins("inner join xt_device_number on xt_device_number.id = xt_schedule.bed_id and xt_device_number.zone_id = ?", partitionType)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("bed_id desc").Find(&schedule).Error
+	return schedule, err, total
+}
+
+func GetPrescriptionInfo(user_org_id int64, patient_id int64, record_date int64) (models.HisPrescriptionInfo, error) {
+
+	info := models.HisPrescriptionInfo{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id =? and record_date = ? and status=1", user_org_id, patient_id, record_date).Find(&info).Error
+	return info, err
+}

service/gobal_config_service.go

@@ -1081,3 +1081,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/his_service.go

@@ -1350,6 +1350,13 @@ func FindAllDiagnose(orgId int64) (list []*models.HisXtDiagnoseConfig, err error
 	return
 }
 
+func FindPatientDianose(orgId int64) (list []*models.XtPatientDiagnose, err error) {
+
+	err = readDb.Where("user_org_id =?", orgId).Find(&list).Error
+
+	return list, err
+}
+
 func FindAllAddition(orgId int64) (list []*models.XtHisAddtionConfig, err error) {
 	db := readDb.Model(&models.XtHisAddtionConfig{})
 	db = db.Where("user_org_id = ? AND status = 1", orgId)

service/manage_center_service.go

@@ -1035,3 +1035,47 @@ func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater i
 	}
 	return err
 }
+
+func CreatePatientDiagnose(diagnose models.XtPatientDiagnose) error {
+
+	err := XTWriteDB().Create(&diagnose).Error
+
+	return err
+}
+
+func GetPatientDiagnose(limit int64, page int64, orgid int64) (list []*models.XtPatientDiagnose, total int64, err error) {
+
+	db := XTReadDB().Model(&list).Where("status =1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&list).Error
+	return
+}
+
+func GetPatientDiagnoseDetail(id int64) (models.XtPatientDiagnose, error) {
+
+	diagnose := models.XtPatientDiagnose{}
+
+	err := XTReadDB().Where("id = ? and status =1", id).Find(&diagnose).Error
+
+	return diagnose, err
+}
+
+func UpdatePatientCase(class_name string, sort int64, id int64) error {
+
+	diagnose := models.XtPatientDiagnose{}
+
+	err := XTReadDB().Model(&diagnose).Where("id = ? and status=1", id).Updates(map[string]interface{}{"class_name": class_name, "sort": sort}).Error
+
+	return err
+}
+
+func DeletePatientDiagnose(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtPatientDiagnose{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/manage_service.go

@@ -374,7 +374,7 @@ func GetDialysisTime(time int64, patientid int64, orgid int64) (models.Assessmen
 }
 
 func GetAllOrganization(orgid int64, appid int64) (approle []*models.App_Role, err error) {
-	err = UserReadDB().Where("org_id = ? AND app_id = ? AND status = 1", orgid, appid).Find(&approle).Error
+	err = UserReadDB().Where("org_id = ? AND app_id = ?", orgid, appid).Find(&approle).Error
 	return approle, err
 }
 
@@ -824,7 +824,7 @@ func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*model
 		if orgId > 0 {
 			db = db.Where("x.user_org_id = ?", orgId)
 		}
-		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.admin_user_id,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
 		if err != nil {
 			return
 		}
@@ -844,7 +844,7 @@ func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*model
 		if orgId > 0 {
 			db = db.Where("x.user_org_id = ?", orgId)
 		}
-		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.admin_user_id,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
 		if err != nil {
 			return
 		}

service/mobile_dialysis_service.go

@@ -4482,13 +4482,14 @@ func GetFistMonitor(orgid int64, patient_id int64, dialysis_date int64) (models.
 	return record, err
 }
 
+func GetFistMonitorSix(orgid int64, patient_id int64, dialysis_date int64) (record []*models.MonitoringRecord, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and monitoring_date = ? and status = 1", orgid, patient_id, dialysis_date).Find(&record).Error
+	return record, err
+}
+
 func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string) ([]*MScheduleDoctorAdviceVM, error) {
 
-	fmt.Println("execution_frequency---------------------------", execution_frequency)
-	fmt.Println("cost_type-----------", cost_type)
-	fmt.Println("adviceType-----------", adviceType)
-	fmt.Println("patientType---------", patientType)
-	fmt.Println("len(deliverWay)--------", len(deliverWay))
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}

service/new_warehouse_service.go

@@ -1308,15 +1308,25 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
 
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
+
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
@@ -1374,12 +1384,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
+
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -1392,13 +1406,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
+		//fmt.Println("stockmin", warehouse.StockMinNumber)
+		//fmt.Println("minnubmerr", minNumber)
 		if warehouse.StockMinNumber < minNumber {
-
+			//fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
 		} else {
+			//fmt.Println("金5")
 			if minNumber > 0 {
 				if (warehouse.StockMinNumber - minNumber) >= 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
@@ -1407,6 +1424,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
 				if warehouse.StockMinNumber > 0 {
 					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -1418,8 +1436,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
@@ -1561,74 +1580,80 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
+		//fmt.Println("deliver_number233233223232wi", deliver_number)
+		//fmt.Println("out_coutn23333333333333333", out_count)
+		//fmt.Println("cancel_coutn099992ow", cancel_count)
 		if deliver_number >= (out_count - cancel_count) {
-			drugflow := models.DrugFlow{
-				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseout.ID,
-				DrugId:                  advice.DrugId,
-				Number:                  warehouse.Number,
-				ProductDate:             warehouse.ProductDate,
-				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
-				Price:                   warehouse.RetailPrice,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				UserOrgId:               orgID,
-				Manufacturer:            warehouse.Manufacturer,
-				Dealer:                  warehouse.Dealer,
-				BatchNumber:             warehouse.BatchNumber,
-				MaxUnit:                 drup.MinUnit,
-				ConsumableType:          3,
-				IsEdit:                  1,
-				Creator:                 advice.ExecutionStaff,
-				IsSys:                   1,
-				PatientId:               advice.PatientId,
-				SystemTime:              advice.AdviceDate,
-				WarehousingDetailId:     warehouse.ID,
-				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-				StorehouseId:            storeConfig.DrugStorehouseOut,
-				WarehouseOutDetailId:    lastDrugOutInfo.ID,
-				OverCount:               sum_count,
-				AdviceId:                advice.ID,
-				LastPrice:               warehouse.Price,
-			}
+			if (deliver_number - out_count - cancel_count) != 0 {
+				drugflow := models.DrugFlow{
+					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+					WarehouseOutId:          warehouseout.ID,
+					DrugId:                  advice.DrugId,
+					Number:                  warehouse.Number,
+					ProductDate:             warehouse.ProductDate,
+					ExpireDate:              warehouse.ExpiryDate,
+					Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+					Price:                   warehouse.RetailPrice,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					UserOrgId:               orgID,
+					Manufacturer:            warehouse.Manufacturer,
+					Dealer:                  warehouse.Dealer,
+					BatchNumber:             warehouse.BatchNumber,
+					MaxUnit:                 drup.MinUnit,
+					ConsumableType:          3,
+					IsEdit:                  1,
+					Creator:                 advice.ExecutionStaff,
+					IsSys:                   1,
+					PatientId:               advice.PatientId,
+					SystemTime:              advice.AdviceDate,
+					WarehousingDetailId:     warehouse.ID,
+					SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+					StorehouseId:            storeConfig.DrugStorehouseOut,
+					WarehouseOutDetailId:    lastDrugOutInfo.ID,
+					OverCount:               sum_count,
+					AdviceId:                advice.ID,
+					LastPrice:               warehouse.Price,
+				}
 
-			errThreeTy := CreateDrugFlowOne(drugflow)
+				errThreeTy := CreateDrugFlowOne(drugflow)
 
-			if errThreeTy != nil {
-				drugError := models.XtDrugError{
-					UserOrgId:             orgID,
-					DrugId:                advice.DrugId,
-					RecordDate:            advice.AdviceDate,
-					PatientId:             advice.PatientId,
-					Remark:                "创建流水失败",
-					Status:                1,
-					Ctime:                 time.Now().Unix(),
-					Mtime:                 0,
-					SumCount:              0,
-					Prescribingnumber:     advice.PrescribingNumber,
-					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				if errThreeTy != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "创建流水失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 				}
-				CreateDrugError(drugError)
-			}
-			//出库数量相加
-			errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+				//出库数量相加
+				errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 
-			if errThreeTys != nil {
-				drugError := models.XtDrugError{
-					UserOrgId:             orgID,
-					DrugId:                advice.DrugId,
-					RecordDate:            advice.AdviceDate,
-					PatientId:             advice.PatientId,
-					Remark:                "出库数量相加失败",
-					Status:                1,
-					Ctime:                 time.Now().Unix(),
-					Mtime:                 0,
-					SumCount:              0,
-					Prescribingnumber:     advice.PrescribingNumber,
-					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				if errThreeTys != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "出库数量相加失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 				}
-				CreateDrugError(drugError)
+
 			}
 
 		}

service/patient_service.go

@@ -871,7 +871,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber}).Error
 	return err
 }
 
@@ -1240,6 +1240,48 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	return
 }
 
+func GetLongDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
+
+	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
+	}
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,x.push_start_time,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
+}
+
 func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
 
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
@@ -1949,7 +1991,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer, "chaptalization": prescription.Chaptalization}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -912,7 +912,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 
 func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRole, err error) {
 
-	err = UserReadDB().Where("org_id = ? and app_id = ? and status = ? ", orgid, appid, 1).Find(&appRole).Error
+	err = UserReadDB().Where("org_id = ? and app_id = ?", orgid, appid).Find(&appRole).Error
 	return appRole, err
 }
 

service/pharmacy_service.go

@@ -1226,8 +1226,7 @@ func FenDrugInventory(item *models.HisDoctorAdviceInfo, orgid int64) bool {
 		total = list.Count*medical.MinNumber + list.StockMinNumber
 		prescribing_number_total = count
 	}
-	fmt.Println("prescribing_number_total-----", prescribing_number_total)
-	fmt.Println("total-------------", total)
+
 	if prescribing_number_total <= total {
 		//可以扣减
 		return true

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -303,6 +303,11 @@ type AssessmentBeforeDislysisVM struct {
 	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
 	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 	UserOrgId                      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CatheterEvaluationProgram      string  `gorm:"column:catheter_evaluation_program" json:"catheter_evaluation_program" form:"catheter_evaluation_program"`
+	SkinSiteCatheterization        string  `gorm:"column:skin_site_catheterization" json:"skin_site_catheterization" form:"skin_site_catheterization"`
+	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
+	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
+	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {
@@ -567,6 +572,8 @@ type MonitoringRecordVM struct {
 	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
+	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/schedule_service.go

@@ -168,6 +168,7 @@ func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, schedu
 		db = db.Where("s.schedule_week in(?)", WeekDayIds)
 	}
 	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Preload("DialysisSolution", "status= 1 and solution_status = 1").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
@@ -1670,3 +1671,20 @@ func CreateScheduleTwo(m *models.Schedule) error {
 	utx.Commit()
 	return err
 }
+
+func GetLongSolutionByModeId(patient_id int64, mode_id int64, user_org_id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err := XTReadDB().Where("patient_id = ? and mode_id = ? and user_org_id = ? and status= 1 and solution_status =1", patient_id, mode_id, user_org_id).Find(&solution).Error
+	return solution, err
+}
+
+func UpdateScheduleByDialysis(patient_id int64, mode_id int64, schedule_date int64, user_org_id int64, dialyzer_perfusion_apparatus string, schedule_type int64) error {
+
+	schedule := models.XtSchedule{}
+
+	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and mode_id = ? and schedule_date = ? and user_org_id = ? and schedule_type = ?", patient_id, mode_id, schedule_date, user_org_id, schedule_type).Updates(map[string]interface{}{"dialysis_machine_name": dialyzer_perfusion_apparatus}).Error
+
+	return err
+}

service/stock_service.go

@@ -982,6 +982,7 @@ type VMDrugWarehouse struct {
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsSys             int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64                `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (VMDrugWarehouse) TableName() string {
@@ -6299,7 +6300,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId}).Error
 	return err
 }
 
@@ -7366,10 +7367,10 @@ func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 	return err
 }
 
-func UpdateCheckWarehouseInfo(id int64) error {
+func UpdateCheckWarehouseInfo(id int64, checker int64) error {
 
 	tx := XTWriteDB().Begin()
-	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1, "checker": checker}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -7506,9 +7507,9 @@ func UpdateWarehouseing(info *models.DrugWarehouseInfo) error {
 	return err
 }
 
-func CheckWarehousingInfo(id int64, orgid int64) error {
+func CheckWarehousingInfo(id int64, orgid int64, checker int64) error {
 	tx := XTWriteDB().Begin()
-	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1, "checker": checker}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/warhouse_service.go

@@ -131,15 +131,25 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
 
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+		}
 	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
+
+	}
+
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
@@ -554,7 +564,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			//HisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
 			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
@@ -1856,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)
@@ -1864,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
@@ -5988,6 +5997,12 @@ func ChangeMaxNumber(id int64, count int64) error {
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
 	return err
 
+}
+func ChangeMaxNumberOne(id int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Updates(map[string]interface{}{"stock_max_number": count, "stock_min_number": 0}).Error
+	return err
+
 }
 
 func UpdateMinNumber(id int64, count int64) error {