11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #
@@ -7,7 +7,7 @@ copyrequestbody = true
 sessionon = true
 #sessiongcmaxlifetime = 64800
 
-tokencookiemaxlifetime = 604800
+tokencookiemaxlifetime = 7200
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
 xsrfexpire = 3600
@@ -219,12 +219,6 @@ writesgjpatientmysqlpass = 1Q2W3e4r!@#$
 writesgjpatientmysqlname = sgj_patient
 
 
-redishost = kuyi6666.redis.rds.aliyuncs.com
-readmysqlhost2 = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readmysqlport2 = 3306
-readmysqluser2 = root
-readmysqlpass2 = 1Q2W3e4r!@#$
-readmysqlname2 = sgj_xt
 
 
 
@@ -232,7 +226,7 @@ readmysqlname2 = sgj_xt
 
 #redishost = 120.77.235.13
 #redishost = 112.74.16.180
-redishost = localhost
+redishost = kuyi6666.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
 redisdb = 7

controllers/base_api_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/service"
-	_ "fmt"
+	"fmt"
 	"strconv"
 	"strings"
 )
@@ -69,9 +69,6 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13416402574"
 		//var userAdmin models.AdminUser
 		//userAdmin.Id = 1448
 		//userAdmin.Mobile = "13318599895"
@@ -102,32 +99,6 @@ func (this *BaseAuthAPIController) Prepare() {
 
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
-		userAdmin.Id = 597
-		userAdmin.Mobile = "13416402574"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 10016
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10016
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
 
 	}
 
@@ -147,7 +118,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
-			// fmt.Println(roles)
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -163,7 +134,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-			// fmt.Println(userRolePurviewsArr)
+			fmt.Println("userRolePurviewsArr", userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -194,6 +165,7 @@ func (this *BaseAuthAPIController) Prepare() {
 						this.StopRun()
 					}
 				}
+
 			}
 		}
 	}
@@ -212,7 +184,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
-			// fmt.Println(roles)
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -228,7 +200,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-			// fmt.Println(userRolePurviewsArr)
+			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -344,35 +316,6 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13416402574"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "13416402574"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 10016
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10016
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
 		//var userAdmin models.AdminUser
 		//userAdmin.Id = 1448
 		//userAdmin.Mobile = "13318599895"

controllers/data_api_controller.go

@@ -114,7 +114,7 @@ func (c *DataApiController) CreateConfig() {
 	} else {
 		dataconfig.Order = 0
 	}
-	fmt.Println("dataconfig-------------", dataconfig)
+
 	err = service.CreateConfig(&dataconfig)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
@@ -225,7 +225,7 @@ func (c *DataApiController) UpdateChildConfig() {
 	dataconfig.Remark = string(dataBody["remark"].(string))
 	dataconfig.Order = int64(dataBody["orders"].(float64))
 	dataconfig.FieldType = int64(dataBody["field_type"].(float64))
-	fmt.Println("dataconfitg------", dataconfig.Order)
+
 	//if dataBody["orders"] != nil {
 	//	dataconfig.Order = int64(dataBody["orders"].(float64))
 	//	fmt.Println("dataconfig",dataconfig.Order)
@@ -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" {
+	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" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -387,7 +387,7 @@ func (c *DialysisApiController) PostPrescription() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 		redis.Set(keyTwo, "", time.Second)
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyThree, "", time.Second)
@@ -452,7 +452,7 @@ func (c *DialysisApiController) PostPrescription() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 		redis.Set(keyOne, "", time.Second)
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyThree, "", time.Second)
@@ -875,7 +875,7 @@ func (c *DialysisApiController) PostSoulution() {
 	//清空key 值
 	redis.Set(keyOne, "", time.Second)
 
-	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 	redis.Set(keyTwo, "", time.Second)
 
 	keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -1288,7 +1288,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyThree, "", time.Second)
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyTwo, "", time.Second)
@@ -1311,7 +1311,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyThree, "", time.Second)
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyTwo, "", time.Second)
@@ -1377,8 +1377,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	puncture_method := c.GetString("puncture_method")
 
 	dialysis_count := c.GetString("dialysis_count")
-	//dialysis_count, _ := c.GetInt64("dialysis_count", 0)
-	dialysis_count := c.GetString("dialysis_count")
+
 	emergency_treatment, _ := c.GetInt64("emergency_treatment", 0)
 	emergency_treatment_other := c.GetString("emergency_treatment_other")
 	ductus_arantii := c.GetString("ductus_arantii")
@@ -1403,7 +1402,6 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	puncture_needle := c.GetString("puncture_needle")
 	//humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
 
-	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	phinholing := c.GetString("pinholing")
 
@@ -1510,7 +1508,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
 		redis.Set(keyOne, "", time.Second)
 
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -1736,7 +1734,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
 		redis.Set(keyOne, "", time.Second)
 		defer redis.Close()
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -1896,7 +1894,7 @@ func (c *DialysisApiController) GetDialysisWatch() {
 		numberList, _ := service.GetAllDeviceNumberByList(adminUserInfo.CurrentOrgId)
 
 		//获取所有分区
-		//zoneList, _ := service.GetAllZoneByList(adminUserInfo.CurrentOrgId)
+		//	zoneList, _ := service.GetAllZoneByList(adminUserInfo.CurrentOrgId)
 		//获取透析处方
 		prescriptions, _ := service.GetAllPrescriptionByListTwo(adminUserInfo.CurrentOrgId, startTime)
 		//获取透前评估
@@ -2295,6 +2293,15 @@ func (this *DialysisApiController) DelMonitor() {
 	//}
 
 	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 值
+	redis.Set(key, "", time.Second)
+
+	keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_record_list_all"
+	redis.Set(keyOne, "", time.Second)
+	defer redis.Close()
+
 	if err != nil {
 		this.ErrorLog("删除透析监测记录失败：%v", err)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
@@ -2403,6 +2410,13 @@ func (c *DialysisApiController) CreateMonitor() {
 	}
 
 	err := service.CreateMonitor(&monitorRecord)
+	redis := service.RedisClient()
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(monitoring_date, 10) + ":monitor_record_list_all"
+
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(monitoring_date, 10) + ":monitor_records"
+	redis.Set(keyOne, "", time.Second)
+	redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
 		return
@@ -3257,9 +3271,14 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
 	redis := service.RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	formatAdviceDate := theTime.Format("2006-01-02")
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
+	redis.Set(keyOne, "", time.Second)
+	keyFour := "scheduals_" + formatAdviceDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(keyFour, "", time.Second)
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -3434,7 +3453,20 @@ func (c *DialysisApiController) UploadDryWeight() {
 			UserId:        adminUserInfo.AdminUser.Id,
 		}
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
+		loc, _ := time.LoadLocation("Local")
+		nowTime := time.Now()
+		nowDay := nowTime.Format("2006-01-02")
+		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		redis := service.RedisClient()
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
 
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+		fmt.Println("敢提哦那个key23232332323223232332232323", key)
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if createErr == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "提交成功",
@@ -3469,6 +3501,20 @@ func (c *DialysisApiController) UploadDryWeight() {
 		fmt.Println(value)
 
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
+		loc, _ := time.LoadLocation("Local")
+		nowTime := time.Now()
+		nowDay := nowTime.Format("2006-01-02")
+		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		redis := service.RedisClient()
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+		redis.Set(key, "", time.Second)
+		fmt.Println("敢提哦那个key23232332323223232332232323", key)
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if createErr == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "提交成功",

controllers/dialysis_record_api_controller.go

@@ -593,10 +593,13 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		createErr := service.CreateMonitor(&monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(monitorParam.MonitoringDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
+
 		if createErr != nil {
 			this.ErrorLog("创建监测记录失败：%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -889,7 +892,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	//清空key 值
 	redis.Set(key, "", time.Second)
 
-	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
 	redis.Set(keyOne, "", time.Second)
 
 	newdialysisRecord, getRecordErr := service.MobileGetDialysisRecord(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
@@ -979,6 +982,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		// 如果当天有插入数据，则不再往透析纪录里插入数据
 		if newdialysisRecord.ID > 0 {
 			err := service.CreateMonitor(&record)
+
 			if err != nil {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
 				return
@@ -1242,7 +1246,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	//清空key 值
 	redis.Set(key, "", time.Second)
 
-	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
 	redis.Set(keyOne, "", time.Second)
 
 	if updateErr != nil {
@@ -1411,6 +1415,10 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+	redis := service.RedisClient()
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(startDate.Unix(), 10) + ":dialysis_orders_list_all"
+	redis.Set(key, "", time.Second)
+	redis.Close()
 	if updateErr != nil {
 		this.ErrorLog("修改上机失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1427,6 +1435,12 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 			hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 			minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", tempMinute*60), 10, 64)
 			updateAssessmentErr := service.UpdateAssessmentAfterDate(tempDialysisRecord.PatientId, tempDialysisRecord.UserOrgId, tempDialysisRecord.DialysisDate, hour, minute)
+			redis := service.RedisClient()
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":assessment_after_dislysis_list_all"
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":dialysis_orders_list_all"
+			redis.Set(key, "", time.Second)
+			redis.Set(keyThree, "", time.Second)
+			redis.Close()
 			if updateAssessmentErr != nil {
 				utils.ErrorLog("%v", updateAssessmentErr)
 			}

controllers/doctors_api_controller.go

@@ -53,6 +53,11 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/gettemplatesummaryprintdetail", &DoctorsApiController{}, "Get:GetTemplateSummaryPrintDetail")
 	beego.Router("/api/patient/updatetemplatesummary", &DoctorsApiController{}, "Post:UpdateTempalteSummary")
 	beego.Router("/api/patient/deletesummary", &DoctorsApiController{}, "Get:DeleteSummary")
+	beego.Router("/api/patient/hospitalsummary", &DoctorsApiController{}, "Get:HospitalSummary")
+	beego.Router("/api/patient/gethospitalsummarylist", &DoctorsApiController{}, "Get:GetHospitalSummaryList")
+	beego.Router("/api/patient/gethospitalsummaydetail", &DoctorsApiController{}, "Get:GetHospitalSummaryDetail")
+	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Get:UpdateHospitalSummary")
+	beego.Router("/api/patient/deletehospitalsummary", &DoctorsApiController{}, "Get:DeleteHospitalSummary")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -85,56 +90,53 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id)
 
 	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
-
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
 
 	for _, item := range project {
 		index := 0
 		for _, subItem := range item.HisPrescriptionTeamProject {
 
-	//获取所有的患者
-	patients, _ := service.GetAllPatientListByListTwo(orgID)
+			//获取所有的患者
+			patients, _ := service.GetAllPatientListByListTwo(orgID)
 
-	//获取所有床位
-	numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
+			//获取所有床位
+			numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
 
-	//获取透析处方
-	prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
+			//获取透析处方
+			prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 
-	//获取上机
-	dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
-	for key, item := range project {
-		for _, patient := range patients {
-			if item.PatientId == patient.ID {
-				project[key].SchedualPatient = patient
-				break
-			}
-		}
-		// 获取床位信息
-		for _, it := range numberList {
-			if item.BedId == it.ID {
-				project[key].DeviceNumber = it
-				break
-			}
-		}
+			//获取上机
+			dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+			for key, item := range project {
+				for _, patient := range patients {
+					if item.PatientId == patient.ID {
+						project[key].SchedualPatient = patient
+						break
+					}
+				}
+				// 获取床位信息
+				for _, it := range numberList {
+					if item.BedId == it.ID {
+						project[key].DeviceNumber = it
+						break
+					}
+				}
 
-		// 获取处方
-		for _, it := range prescriptions {
-			if item.PatientId == it.PatientId {
-				project[key].Prescription = it
-				break
-			}
-		}
+				// 获取处方
+				for _, it := range prescriptions {
+					if item.PatientId == it.PatientId {
+						project[key].Prescription = it
+						break
+					}
+				}
 
-		//获取上机
-		for _, it := range dialysisOrders {
-			if item.PatientId == it.PatientId {
-				project[key].DialysisOrder = it
-				break
+				//获取上机
+				for _, it := range dialysisOrders {
+					if item.PatientId == it.PatientId {
+						project[key].DialysisOrder = it
+						break
+					}
+				}
 			}
-		}
-	}
 			if subItem.HisProject.CostClassify != 3 {
 				subItem.IsCheckTeam = 2
 				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
@@ -232,28 +234,24 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	userid := adminUserInfo.AdminUser.Id
-	fmt.Println("userid", userid)
+
 	dry_weight, _ := c.GetFloat("dry_weight")
-	fmt.Println("dry_weight", dry_weight)
+
 	doctors, _ := c.GetInt64("doctors")
-	fmt.Println("doctors", doctors)
+
 	remarks := c.GetString("remarks")
-	fmt.Println("remarks", remarks)
+
 	patientid, _ := c.GetInt64("patient_id")
-	fmt.Println("patientid", patientid)
+
 	//透前数据
 	dryweight, _ := c.GetFloat("dryweight")
-	fmt.Println("dryweight", dryweight)
+
 	var weight = dryweight - dry_weight
 	weights := fmt.Sprintf("%.1f", weight)
-	//weights := strconv.FormatFloat(sprintf, 'E', -1, 64)
 
-	fmt.Println("weight", weights)
-	fmt.Println("weight", weight)
 	var sum string
-	dryWeight, errcode := service.QueryDryWeight(orgid, patientid)
-	fmt.Println("errcode", errcode)
-	fmt.Println("dryWeight", dryWeight)
+	_, errcode := service.QueryDryWeight(orgid, patientid)
+
 	if errcode == gorm.ErrRecordNotFound {
 		sum = "/"
 		patientDryweight := models.SgjPatientDryweight{
@@ -269,6 +267,27 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 		}
 
 		err := service.CreatePatientWeight(&patientDryweight)
+
+		loc, _ := time.LoadLocation("Local")
+		nowTime := time.Now()
+		nowDay := nowTime.Format("2006-01-02")
+		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		fmt.Println("是错2323223322323232323", dayTime.Unix())
+		redis := service.RedisClient()
+		keyTwo := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":last_dry_weight"
+		redis.Set(keyTwo, "", time.Second)
+
+		prescription := models.PredialysisEvaluation{
+			DryWeight:      dry_weight,
+			AssessmentDate: dayTime.Unix(),
+		}
+		errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
+		fmt.Println(errors)
+		keyThree := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+		redis.Set(keyThree, "", time.Second)
+		keyFive := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
+		redis.Set(keyFive, "", time.Second)
+		redis.Close()
 		fmt.Println("err", err)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patientDryweight": patientDryweight,
@@ -303,19 +322,34 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 	}
 
 	err := service.CreatePatientWeight(&patientDryweight)
-	//sgjPatientDryweight, _ := service.GetLastData(orgid)
+
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	fmt.Scan("parseDateErr", parseDateErr)
 	nowtime := recordDate.Unix()
 	fmt.Println("nowtime", nowtime)
-	//prescription := models.PredialysisEvaluation{
-	//	DryWeight: dryweight,
-	//}
-	//errors := service.UpdateDialysisPrescription( sgjPatientDryweight.PatientId, sgjPatientDryweight.UserOrgId, sgjPatientDryweight.DryWeight, prescription)
-	//fmt.Println("error",errors)
+	loc, _ := time.LoadLocation("Local")
+	nowTime := time.Now()
+	nowDay := nowTime.Format("2006-01-02")
+	dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+	fmt.Println("是错2323223322323232323", dayTime.Unix())
+	redis := service.RedisClient()
+
+	keyTwo := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":last_dry_weight"
+	redis.Set(keyTwo, "", time.Second)
+
+	prescription := models.PredialysisEvaluation{
+		DryWeight:      dry_weight,
+		AssessmentDate: dayTime.Unix(),
+	}
+	errors := service.UpdateDialysisPrescription(patientid, orgid, dryweight, prescription)
+	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+	redis.Set(key, "", time.Second)
+	keySix := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
+	redis.Set(keySix, "", time.Second)
+	fmt.Println("error", errors)
 	fmt.Println("err", err)
-	fmt.Println("patientdryweight", patientDryweight)
+	redis.Close()
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patientDryweight": patientDryweight,
 	})
@@ -1173,3 +1207,205 @@ func (this *DoctorsApiController) DeleteSummary() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *DoctorsApiController) HospitalSummary() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	admission_time := this.GetString("admission_time")
+	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
+	admissiontime := admissionTimes.Unix()
+
+	admitting_diagnosis := this.GetString("admitting_diagnosis")
+	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
+
+	connecticut := this.GetString("connecticut")
+	dean, _ := this.GetInt64("dean")
+	discharge_diagnosis := this.GetString("discharge_diagnosis")
+
+	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
+	diagnosis_admission := this.GetString("diagnosis_admission")
+	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
+	discharge_advice_id := this.GetString("discharge_advice_id")
+	discharge_advice := this.GetString("discharge_advice")
+
+	discharge_time := this.GetString("discharge_time")
+	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
+	dischargetime := dischargeTimes.Unix()
+	doctor, _ := this.GetInt64("doctor")
+	illness_discharge_id := this.GetString("illness_discharge_id")
+	illness_discharge := this.GetString("illness_discharge")
+	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
+	pathology := this.GetString("pathology")
+	record_date := this.GetString("record_date")
+	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recordtime := recordDates.Unix()
+	sick_personnel := this.GetString("sick_personnel")
+	title := this.GetString("title")
+	treatment_id := this.GetString("treatment_id")
+	treatment := this.GetString("treatment")
+	ultrasound := this.GetString("ultrasound")
+	xray := this.GetString("xray")
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	summary := models.XtHospitalSummary{
+		PatientId:                patient_id,
+		AdmissionTime:            admissiontime,
+		DischargeTime:            dischargetime,
+		SickPersonnel:            sick_personnel,
+		Xray:                     xray,
+		Connecticut:              connecticut,
+		NuclearMagneticResonance: nuclear_magnetic_resonance,
+		Ultrasound:               ultrasound,
+		Pathology:                pathology,
+		AdmittingDiagnosisId:     admitting_diagnosis_id,
+		AdmittingDiagnosis:       admitting_diagnosis,
+		DischargeDiagnosis:       discharge_diagnosis,
+		DiagnosisAdmissionId:     diagnosis_admission_id,
+		DiagnosisAdmission:       diagnosis_admission,
+		TreatmentId:              treatment_id,
+		Treatment:                treatment,
+		IllnessDischargeId:       illness_discharge_id,
+		IllnessDischarge:         illness_discharge,
+		DischargeAdviceId:        discharge_advice_id,
+		DischargeAdvice:          discharge_advice,
+		UserOrgId:                orgId,
+		Status:                   1,
+		Ctime:                    time.Now().Unix(),
+		Mtime:                    0,
+		RecordTime:               recordtime,
+		Title:                    title,
+		Doctor:                   doctor,
+		RecordDate:               recordtime,
+		DeanId:                   dean,
+		DischargeDiagnosisId:     discharge_diagnosis_id,
+	}
+	service.CreateHisSummary(&summary)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": summary,
+	})
+	return
+}
+
+func (this *DoctorsApiController) GetHospitalSummaryList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	startime := dischargeTimes.Unix()
+	end_time := this.GetString("end_time")
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+	endtime := endTimes.Unix()
+	list, err := service.GetHospitalSummaryList(orgId, patient_id, startime, endtime)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) GetHospitalSummaryDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetHospitalSummaryDetail(id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"detail": detail,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) UpdateHospitalSummary() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	admission_time := this.GetString("admission_time")
+	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
+	admissiontime := admissionTimes.Unix()
+
+	id, _ := this.GetInt64("id")
+	admitting_diagnosis := this.GetString("admitting_diagnosis")
+	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
+
+	connecticut := this.GetString("connecticut")
+	dean, _ := this.GetInt64("dean")
+	discharge_diagnosis := this.GetString("discharge_diagnosis")
+
+	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
+	diagnosis_admission := this.GetString("diagnosis_admission")
+	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
+	discharge_advice_id := this.GetString("discharge_advice_id")
+	discharge_advice := this.GetString("discharge_advice")
+
+	discharge_time := this.GetString("discharge_time")
+	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
+	dischargetime := dischargeTimes.Unix()
+	doctor, _ := this.GetInt64("doctor")
+	illness_discharge_id := this.GetString("illness_discharge_id")
+	illness_discharge := this.GetString("illness_discharge")
+	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
+	pathology := this.GetString("pathology")
+	record_date := this.GetString("record_date")
+	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recordtime := recordDates.Unix()
+	sick_personnel := this.GetString("sick_personnel")
+	title := this.GetString("title")
+	treatment_id := this.GetString("treatment_id")
+	treatment := this.GetString("treatment")
+	ultrasound := this.GetString("ultrasound")
+	xray := this.GetString("xray")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	summary := models.XtHospitalSummary{
+		PatientId:                patient_id,
+		AdmissionTime:            admissiontime,
+		DischargeTime:            dischargetime,
+		SickPersonnel:            sick_personnel,
+		Xray:                     xray,
+		Connecticut:              connecticut,
+		NuclearMagneticResonance: nuclear_magnetic_resonance,
+		Ultrasound:               ultrasound,
+		Pathology:                pathology,
+		AdmittingDiagnosisId:     admitting_diagnosis_id,
+		AdmittingDiagnosis:       admitting_diagnosis,
+		DischargeDiagnosis:       discharge_diagnosis,
+		DiagnosisAdmissionId:     diagnosis_admission_id,
+		DiagnosisAdmission:       diagnosis_admission,
+		TreatmentId:              treatment_id,
+		Treatment:                treatment,
+		IllnessDischargeId:       illness_discharge_id,
+		IllnessDischarge:         illness_discharge,
+		DischargeAdviceId:        discharge_advice_id,
+		DischargeAdvice:          discharge_advice,
+		Mtime:                    time.Now().Unix(),
+		RecordTime:               recordtime,
+		Title:                    title,
+		Doctor:                   doctor,
+		RecordDate:               recordtime,
+		DeanId:                   dean,
+		DischargeDiagnosisId:     discharge_diagnosis_id,
+	}
+	err := service.UpdateHospital(id, summary)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"detail": summary,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) DeleteHospitalSummary() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteHospitalSummary(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/gobal_config_api_controller.go

@@ -1632,14 +1632,17 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 	limit, _ := c.GetInt64("limit")
 
 	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
-
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"detail": detail,
-		"total":  total,
+		"detail":         detail,
+		"total":          total,
+		"drugTypeParent": drugTypeList,
 	})
 }
 
@@ -1719,15 +1722,18 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-
 	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order": order,
-		"total": total,
+		"order":        order,
+		"total":        total,
+		"drugTypeList": drugTypeList,
 	})
 }
 
@@ -1765,15 +1771,18 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	page, _ := c.GetInt64("page")
 	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword)
 	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
-
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":      order,
-		"total":      total,
-		"orderPrint": orderPrint,
+		"order":        order,
+		"total":        total,
+		"orderPrint":   orderPrint,
+		"drugTypeList": drugTypeList,
 	})
 }
 

controllers/his_api_controller.go

@@ -582,24 +582,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		}
 	}
 
-
 	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
 
-	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
-	if config.ID > 0 && config.IsOpen == 1 {
-		for _, item := range drugs {
-			var index = 0
-			for _, subItem := range item.OtherDrugWarehouseInfo {
-				if index == 0 {
-					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
-						index = index + 1
-						item.MinPrice = subItem.Price
-					}
-				}
-			}
-		}
-	}
-
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
@@ -670,7 +654,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
 
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-	fmt.Println("drugStockConfig94394343344334344343434334", drugStockConfig)
+
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	if drugStockConfig.IsOpen == 1 {
@@ -828,7 +812,15 @@ func (c *HisApiController) CreateHisPrescription() {
 			PType:              p_type,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
-
+		redis := service.RedisClient()
+		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+		fmt.Println("key111111111111111111", key)
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+		redis.Set(keyOne, "", time.Second)
+		keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+		redis.Set(keySeven, "", time.Second)
+		redis.Close()
 	} else {
 		hpInfo = models.HisPrescriptionInfo{
 
@@ -854,6 +846,15 @@ func (c *HisApiController) CreateHisPrescription() {
 			HisPatientId:       info.HisPatientId,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+		redis.Set(key, "", time.Second)
+		fmt.Println("key22222222222222222", key)
+		keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+		redis.Set(keyOne, "", time.Second)
+		keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+		redis.Set(keySeven, "", time.Second)
+		redis.Close()
 	}
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -938,7 +939,15 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 					tempPrescription = prescription
 					service.SaveHisPrescription(tempPrescription)
-
+					redis := service.RedisClient()
+					key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+					redis.Set(key, "", time.Second)
+					fmt.Println("key3333333333333", key)
+					keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+					redis.Set(keyOne, "", time.Second)
+					keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+					redis.Set(keySeven, "", time.Second)
+					redis.Close()
 				} else {
 					tempPrescription.ID = id
 					tempPrescription.Type = types
@@ -949,6 +958,15 @@ func (c *HisApiController) CreateHisPrescription() {
 					tempPrescription.PreTime = pTime
 					tempPrescription.MedType = med_type
 					service.SaveHisPrescription(tempPrescription)
+					redis := service.RedisClient()
+					key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+					fmt.Println("key444444444444444", key)
+					redis.Set(key, "", time.Second)
+					keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+					redis.Set(keyOne, "", time.Second)
+					keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+					redis.Set(keySeven, "", time.Second)
+					redis.Close()
 				}
 				//service.SaveHisPrescription(prescription)
 				//更改患者挂号状态
@@ -988,10 +1006,15 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							s.StartTime = pTime
 							service.CreateHisDoctorAdvice(&s)
-							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
 							redis := service.RedisClient()
+							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							redis.Set(key, "", time.Second)
-							defer redis.Close()
+							fmt.Println("key55555555555555", key)
+							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							fmt.Println("keyOne", keyOne)
+							redis.Set(keyOne, "", time.Second)
+							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+							redis.Set(keySeven, "", time.Second)
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
 							timestamp := time.Now().Unix()
@@ -999,8 +1022,14 @@ func (c *HisApiController) CreateHisPrescription() {
 							timeFormat := tempTime.Format("20060102150405")
 							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 							service.CreateHisDoctorAdvice(&s)
-							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
-							redis.Set(keyOne, "", time.Second)
+							keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+							redis.Set(keySix, "", time.Second)
+							fmt.Println("key55555555555555", keySix)
+							keyFive := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							redis.Set(keyFive, "", time.Second)
+							keyEight := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+							redis.Set(keyEight, "", time.Second)
+							defer redis.Close()
 						}
 					}
 				}
@@ -1322,6 +1351,16 @@ func (c *HisApiController) EditHisPrescription() {
 								return
 							}
 							service.CreateHisDoctorAdvice(&s)
+							redis := service.RedisClient()
+							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+							redis.Set(key, "", time.Second)
+							fmt.Println("key55555555555555", key)
+							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							fmt.Println("keyOne", keyOne)
+							redis.Set(keyOne, "", time.Second)
+							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+							redis.Set(keySeven, "", time.Second)
+							redis.Close()
 
 						}
 					}
@@ -1427,6 +1466,10 @@ func (c *HisApiController) DeletePrescription() {
 			if len(advices) > 0 {
 				for _, item := range advices {
 					drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
+					redis := service.RedisClient()
+					keyFive := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+					redis.Set(keyFive, "", time.Second)
+					redis.Close()
 					if item.PrescribingNumberUnit == drug.MinUnit {
 						drug.Total = drug.Total + item.PrescribingNumber
 						service.UpdateBaseDrugLib(&drug)
@@ -1453,21 +1496,229 @@ func (c *HisApiController) DeletePrescription() {
 func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
+
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
 	err := service.DelelteDoctorAdvice(id, c.GetAdminUserInfo().CurrentOrgId)
+	redis := service.RedisClient()
+	keyFive := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+	redis.Set(keyFive, "", time.Second)
+	redis.Close()
 	if err == nil {
 		if drugStockConfig.IsOpen == 1 {
-			drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
-			if advice.PrescribingNumberUnit == drug.MinUnit {
-				drug.Total = drug.Total + advice.PrescribingNumber
-				service.UpdateBaseDrugLib(&drug)
-			} else {
-				if advice.PrescribingNumberUnit == drug.MaxUnit {
-					advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
-					drug.Total = drug.Total + advice.PrescribingNumber
-					service.UpdateBaseDrugLib(&drug)
+			//判断该医嘱是否执行了
+			if advice.ExecutionState == 1 {
+				//查询该病人该药品是否有库存记录
+				info, errcode := service.GetDrugAutoWarehouseOut(advice.PatientId, advice.AdviceDate, advice.DrugId)
+				if errcode == gorm.ErrRecordNotFound {
+
+				} else {
+					//退库
+					drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
+					if advice.PrescribingNumberUnit == drug.MinUnit {
+
+						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+						//退库
+						warehouseInfo := models.DrugWarehouseInfo{
+							StockMinNumber: prescribingNumber,
+						}
+
+						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
+
+						adminUserInfo := c.GetAdminUserInfo()
+						operation_time := time.Now().Unix()
+						creater := adminUserInfo.AdminUser.Id
+
+						ctime := time.Now().Unix()
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
+						total = total + 1
+						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+						cancelStock := models.DrugCancelStock{
+							OrderNumber:  orderNumber,
+							OperaTime:    operation_time,
+							OrgId:        adminUserInfo.CurrentOrgId,
+							Creater:      creater,
+							Ctime:        ctime,
+							Status:       1,
+							ReturnTime:   advice.AdviceDate,
+							Dealer:       info.Dealer,
+							Manufacturer: info.Manufacturer,
+							Type:         1,
+						}
+						service.AddSigleDrugCancelStock(&cancelStock)
+
+						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+						dealer, _ := service.GetDealerById(info.Dealer)
+						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
+						cancelStockInfo := models.DrugCancelStockInfo{
+							OrderNumber:      cancelInfo.OrderNumber,
+							CancelStockId:    cancelInfo.ID,
+							DrugId:           info.DrugId,
+							Count:            info.Count,
+							Status:           1,
+							Ctime:            ctime,
+							OrgId:            adminUserInfo.CurrentOrgId,
+							Type:             1,
+							Manufacturer:     manufactureName.ManufacturerName,
+							Dealer:           dealer.DealerName,
+							Total:            0,
+							RetailPrice:      info.RetailPrice,
+							RetailTotalPrice: info.RetailTotalPrice,
+							Price:            info.Price,
+							RegisterAccount:  "",
+							Remark:           info.Remark,
+							BatchNumber:      info.BatchNumber,
+							MaxUnit:          info.CountUnit,
+							ProductDate:      info.ProductDate,
+							ExpiryDate:       info.ExpiryDate,
+							BatchNumberId:    info.WarehouseInfoId,
+						}
+
+						flow := models.DrugFlow{
+							WarehousingId:           0,
+							DrugId:                  info.DrugId,
+							Number:                  "",
+							BatchNumber:             info.BatchNumber,
+							Count:                   info.Count,
+							UserOrgId:               adminUserInfo.CurrentOrgId,
+							PatientId:               0,
+							SystemTime:              ctime,
+							ConsumableType:          4,
+							IsSys:                   0,
+							WarehousingOrder:        "",
+							WarehouseOutId:          0,
+							WarehouseOutOrderNumber: "",
+							IsEdit:                  0,
+							CancelStockId:           cancelStock.ID,
+							CancelOrderNumber:       cancelStock.OrderNumber,
+							Manufacturer:            info.Manufacturer,
+							Dealer:                  info.Dealer,
+							Creator:                 adminUserInfo.AdminUser.Id,
+							UpdateCreator:           0,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   0,
+							Price:                   info.Price,
+							WarehousingDetailId:     0,
+							WarehouseOutDetailId:    0,
+							CancelOutDetailId:       0,
+							ExpireDate:              info.ExpiryDate,
+							ProductDate:             info.ProductDate,
+							MaxUnit:                 info.CountUnit,
+							MinUnit:                 "",
+						}
+						service.CreatedCancelStock(cancelStockInfo)
+						service.CreateDrugFlowOne(flow)
+					} else {
+
+						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+
+						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+						fmt.Println("PrescribingNumber", prescribingNumber)
+						if advice.PrescribingNumberUnit == drug.MaxUnit {
+							warehouseInfo := models.DrugWarehouseInfo{
+								StockMinNumber: prescribingNumber,
+							}
+							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+
+						}
+						adminUserInfo := c.GetAdminUserInfo()
+						operation_time := time.Now().Unix()
+						creater := adminUserInfo.AdminUser.Id
+
+						ctime := time.Now().Unix()
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
+						total = total + 1
+						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+						cancelStock := models.DrugCancelStock{
+							OrderNumber:  orderNumber,
+							OperaTime:    operation_time,
+							OrgId:        adminUserInfo.CurrentOrgId,
+							Creater:      creater,
+							Ctime:        ctime,
+							Status:       1,
+							ReturnTime:   advice.AdviceDate,
+							Dealer:       info.Dealer,
+							Manufacturer: info.Manufacturer,
+							Type:         1,
+						}
+						service.AddSigleDrugCancelStock(&cancelStock)
+
+						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+						dealer, _ := service.GetDealerById(info.Dealer)
+						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
+						cancelStockInfo := models.DrugCancelStockInfo{
+							OrderNumber:      cancelInfo.OrderNumber,
+							CancelStockId:    cancelInfo.ID,
+							DrugId:           info.DrugId,
+							Count:            info.Count,
+							Status:           1,
+							Ctime:            ctime,
+							OrgId:            adminUserInfo.CurrentOrgId,
+							Type:             1,
+							Manufacturer:     manufactureName.ManufacturerName,
+							Dealer:           dealer.DealerName,
+							Total:            0,
+							RetailPrice:      info.RetailPrice,
+							RetailTotalPrice: info.RetailTotalPrice,
+							Price:            info.Price,
+							RegisterAccount:  "",
+							Remark:           info.Remark,
+							BatchNumber:      info.BatchNumber,
+							MaxUnit:          info.CountUnit,
+							ProductDate:      info.ProductDate,
+							ExpiryDate:       info.ExpiryDate,
+							BatchNumberId:    info.WarehouseInfoId,
+						}
+
+						flow := models.DrugFlow{
+							WarehousingId:           0,
+							DrugId:                  info.DrugId,
+							Number:                  "",
+							BatchNumber:             info.BatchNumber,
+							Count:                   info.Count,
+							UserOrgId:               adminUserInfo.CurrentOrgId,
+							PatientId:               0,
+							SystemTime:              ctime,
+							ConsumableType:          4,
+							IsSys:                   0,
+							WarehousingOrder:        "",
+							WarehouseOutId:          0,
+							WarehouseOutOrderNumber: "",
+							IsEdit:                  0,
+							CancelStockId:           cancelStock.ID,
+							CancelOrderNumber:       cancelStock.OrderNumber,
+							Manufacturer:            info.Manufacturer,
+							Dealer:                  info.Dealer,
+							Creator:                 adminUserInfo.AdminUser.Id,
+							UpdateCreator:           0,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   0,
+							Price:                   info.Price,
+							WarehousingDetailId:     0,
+							WarehouseOutDetailId:    0,
+							CancelOutDetailId:       0,
+							ExpireDate:              info.ExpiryDate,
+							ProductDate:             info.ProductDate,
+							MaxUnit:                 info.CountUnit,
+							MinUnit:                 "",
+						}
+						service.CreatedCancelStock(cancelStockInfo)
+						service.CreateDrugFlowOne(flow)
+					}
 				}
 			}
+
 		}
 
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1500,7 +1751,6 @@ func (c *HisApiController) DeleteProject() {
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-
 				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
@@ -5568,3 +5818,219 @@ func RemoveRepeatedTeam(arr []*models.HisOrderInfoTwo) (newArr []*models.HisOrde
 	}
 	return
 }
+
+//修改处方退库操作 参数传修改之前的处方数据
+func DeleteDrugWarehosueInfo(advice models.HisDoctorAdviceInfo) (err error) {
+
+	if advice.ExecutionState == 1 {
+		//查询该病人该药品是否有库存记录
+		info, errcode := service.GetDrugAutoWarehouseOut(advice.PatientId, advice.AdviceDate, advice.DrugId)
+		if errcode == gorm.ErrRecordNotFound {
+
+		} else {
+			//退库
+			drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+			if advice.PrescribingNumberUnit == drug.MinUnit {
+
+				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+				//退库
+				warehouseInfo := models.DrugWarehouseInfo{
+					StockMinNumber: prescribingNumber,
+				}
+
+				service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
+
+				operation_time := time.Now().Unix()
+				creater := advice.AdviceDoctor
+
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllDrugCancelStockTotal(advice.UserOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				cancelStock := models.DrugCancelStock{
+					OrderNumber:  orderNumber,
+					OperaTime:    operation_time,
+					OrgId:        advice.UserOrgId,
+					Creater:      creater,
+					Ctime:        ctime,
+					Status:       1,
+					ReturnTime:   advice.AdviceDate,
+					Dealer:       info.Dealer,
+					Manufacturer: info.Manufacturer,
+					Type:         1,
+				}
+				service.AddSigleDrugCancelStock(&cancelStock)
+
+				manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+				dealer, _ := service.GetDealerById(info.Dealer)
+				cancelInfo, _ := service.GetLastDrugCancelStockById(advice.UserOrgId)
+				cancelStockInfo := models.DrugCancelStockInfo{
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
+					DrugId:           info.DrugId,
+					Count:            info.Count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            advice.UserOrgId,
+					Type:             1,
+					Manufacturer:     manufactureName.ManufacturerName,
+					Dealer:           dealer.DealerName,
+					Total:            0,
+					RetailPrice:      info.RetailPrice,
+					RetailTotalPrice: info.RetailTotalPrice,
+					Price:            info.Price,
+					RegisterAccount:  "",
+					Remark:           info.Remark,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.CountUnit,
+					ProductDate:      info.ProductDate,
+					ExpiryDate:       info.ExpiryDate,
+					BatchNumberId:    info.WarehouseInfoId,
+				}
+
+				flow := models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  info.DrugId,
+					Number:                  "",
+					BatchNumber:             info.BatchNumber,
+					Count:                   info.Count,
+					UserOrgId:               advice.UserOrgId,
+					PatientId:               0,
+					SystemTime:              ctime,
+					ConsumableType:          4,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: "",
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            info.Manufacturer,
+					Dealer:                  info.Dealer,
+					Creator:                 advice.UserOrgId,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   info.Price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              info.ExpiryDate,
+					ProductDate:             info.ProductDate,
+					MaxUnit:                 info.CountUnit,
+					MinUnit:                 "",
+				}
+				service.CreatedCancelStock(cancelStockInfo)
+				service.CreateDrugFlowOne(flow)
+			} else {
+
+				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+				fmt.Println("PrescribingNumber", prescribingNumber)
+				if advice.PrescribingNumberUnit == drug.MaxUnit {
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMinNumber: prescribingNumber,
+					}
+					service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+
+				}
+
+				operation_time := time.Now().Unix()
+				creater := advice.AdviceDoctor
+
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllDrugCancelStockTotal(advice.UserOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				cancelStock := models.DrugCancelStock{
+					OrderNumber:  orderNumber,
+					OperaTime:    operation_time,
+					OrgId:        advice.UserOrgId,
+					Creater:      creater,
+					Ctime:        ctime,
+					Status:       1,
+					ReturnTime:   advice.AdviceDate,
+					Dealer:       info.Dealer,
+					Manufacturer: info.Manufacturer,
+					Type:         1,
+				}
+				service.AddSigleDrugCancelStock(&cancelStock)
+
+				manufactureName, _ := service.GetManufactureById(info.Manufacturer)
+				dealer, _ := service.GetDealerById(info.Dealer)
+				cancelInfo, _ := service.GetLastDrugCancelStockById(advice.UserOrgId)
+				cancelStockInfo := models.DrugCancelStockInfo{
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
+					DrugId:           info.DrugId,
+					Count:            info.Count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            advice.UserOrgId,
+					Type:             1,
+					Manufacturer:     manufactureName.ManufacturerName,
+					Dealer:           dealer.DealerName,
+					Total:            0,
+					RetailPrice:      info.RetailPrice,
+					RetailTotalPrice: info.RetailTotalPrice,
+					Price:            info.Price,
+					RegisterAccount:  "",
+					Remark:           info.Remark,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.CountUnit,
+					ProductDate:      info.ProductDate,
+					ExpiryDate:       info.ExpiryDate,
+					BatchNumberId:    info.WarehouseInfoId,
+				}
+
+				flow := models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  info.DrugId,
+					Number:                  "",
+					BatchNumber:             info.BatchNumber,
+					Count:                   info.Count,
+					UserOrgId:               advice.UserOrgId,
+					PatientId:               0,
+					SystemTime:              ctime,
+					ConsumableType:          4,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: "",
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            info.Manufacturer,
+					Dealer:                  info.Dealer,
+					Creator:                 advice.AdviceDoctor,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   info.Price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              info.ExpiryDate,
+					ProductDate:             info.ProductDate,
+					MaxUnit:                 info.CountUnit,
+					MinUnit:                 "",
+				}
+				service.CreatedCancelStock(cancelStockInfo)
+				service.CreateDrugFlowOne(flow)
+			}
+		}
+	}
+	return err
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -64,110 +64,8 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 	theAssessmentDateTime := theStartTime.Unix()
 
 	if dialysistype == 1 {
-		// 保存透前相关数据
-		// 获取透析处方
-		//dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-		//if getDialysisPrescribeErr != nil {
-		//	c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//	return
-		//}
-		//
-		//// 获取透析模版
-		//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
-		//if getDialysisSolutionErr != nil {
-		//	c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//	return
-		//}
-
-		// 插入透析处方
-		//if dialysisPrescribe == nil && dialysisSolution != nil {
-		//	var newprescribe models.DialysisPrescription
-		//	newprescribe.UserOrgId = dialysisSolution.UserOrgId
-		//	newprescribe.PatientId = dialysisSolution.PatientId
-		//	newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
-		//	newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
-		//	newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
-		//	newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
-		//	newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
-		//	newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
-		//	newprescribe.ModeId = dialysisSolution.ModeId
-		//	newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
-		//	newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
-		//	newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
-		//	newprescribe.BloodFilter = dialysisSolution.BloodFilter
-		//	newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
-		//	newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
-		//	newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
-		//	newprescribe.Glucose = dialysisSolution.Glucose
-		//	newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
-		//	newprescribe.Kalium = dialysisSolution.Kalium
-		//	newprescribe.Sodium = dialysisSolution.Sodium
-		//	newprescribe.Calcium = dialysisSolution.Calcium
-		//	newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
-		//	newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
-		//	newprescribe.Conductivity = dialysisSolution.Conductivity
-		//	newprescribe.BodyFluid = dialysisSolution.BodyFluid
-		//	newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
-		//	newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
-		//	newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
-		//	newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
-		//	newprescribe.BloodAccess = dialysisSolution.BloodAccess
-		//	newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
-		//	newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
-		//	newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
-		//	newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
-		//	newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
-		//	newprescribe.Dialyzer = dialysisSolution.Dialyzer
-		//	newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
-		//	newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
-		//	newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
-		//	newprescribe.TargetKtv = dialysisSolution.TargetKtv
-		//
-		//	newprescribe.CreatedTime = time.Now().Unix()
-		//	newprescribe.UpdatedTime = time.Now().Unix()
-		//	newprescribe.RecordDate = theAssessmentDateTime
-		//	// newprescribe.DewaterAmount = dewater_amount
-		//	// newprescribe.TargetUltrafiltration = dewater_amount
-		//	newprescribe.Status = 1
-		//
-		//	err := service.AddSigleRecord(&newprescribe)
-		//	if err != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-		//	}
-		//}
-
-		//if dialysisPrescribe == nil && dialysisSolution == nil {
-		//	var newprescribe models.DialysisPrescription
-		//	newprescribe.UserOrgId = adminUserInfo.Org.Id
-		//	newprescribe.PatientId = id
-		//	newprescribe.CreatedTime = time.Now().Unix()
-		//	newprescribe.UpdatedTime = time.Now().Unix()
-		//	newprescribe.RecordDate = theAssessmentDateTime
-		//	// newprescribe.DewaterAmount = dewater_amount
-		//	// newprescribe.TargetUltrafiltration = dewater_amount
-		//	newprescribe.Status = 1
-		//
-		//	err := service.AddSigleRecord(&newprescribe)
-		//	if err != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-		//	}
-		//}
-
-		//if dialysisPrescribe != nil {
-		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
-		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
-		//	// dialysisPrescribe.DewaterAmount = dewater_amount
-		//	// dialysisPrescribe.TargetUltrafiltration = dewater_amount
-		//	dialysisPrescribe.Status = 1
-		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-		//	if updateErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-		//	}
-		//}
 
-		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
 			c.ErrorLog("获取透前评估失败:%v", getPEErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -187,9 +85,10 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 			evaluation.PatientId = id
 			evaluation.UserOrgId = adminUserInfo.Org.Id
 			// 获取上一次透前评估信息，部分数据是需要从上一次透前评估继承
-			lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluationOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			// 获取上一次透后评估，插入本次透前评估的上次透后体重（weight_after_last_transparency）字段
-			assessmentAfterDislysis, getAADErr := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			assessmentAfterDislysis, getAADErr := service.MobileGetLastTimeAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+
 			if getAADErr != nil {
 				c.ErrorLog("获取透后评估失败:%v", getAADErr)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -228,6 +127,18 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		evaluation.AssessmentTime = time.Now().Unix()
 
 		err := service.UpadatePredialysisEvaluation(&evaluation)
+
+		assessdateDateStart := thisTime.Format("2006-01-02")
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+		keyTwo := "scheduals_" + assessdateDateStart + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 			return
@@ -242,7 +153,7 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 	} else {
 
 		// 保存透后相关数据
-		assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysis(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 
 		if getAADErr != nil {
 			c.ErrorLog("获取透后评估失败:%v", getAADErr)
@@ -277,6 +188,16 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
+		assessdateDateStart := thisTime.Format("2006-01-02")
+		keyTwo := "scheduals_" + assessdateDateStart + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyTwo, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": afterevaluation,
@@ -365,13 +286,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		//if weightfirst.DryWeight > weighing_before {
 		//	return
 		//}
-
 		dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if schedual != nil {
 			// 获取透析模版
-			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
-			system_dialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeId(adminUserInfo.Org.Id, schedual.ModeId)
-			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.Org.Id, id, schedual.ModeId)
+			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
+			system_dialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, schedual.ModeId)
+			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
 			mode_id = schedual.ModeId
 		} else {
 			// 获取透析模版
@@ -438,8 +358,18 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
-
+			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			scheduleDateStartOne := thisTime.Format("2006-01-02")
+			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			redis.Set(keyThree, "", time.Second)
+			defer redis.Close()
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
@@ -497,6 +427,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				scheduleDateStartOne := thisTime.Format("2006-01-02")
+				keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				redis.Set(keyThree, "", time.Second)
+				defer redis.Close()
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -554,6 +494,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				fmt.Println(newprescribe.TargetUltrafiltration)
 
 				err := service.AddSigleRecord(&newprescribe)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				scheduleDateStartOne := thisTime.Format("2006-01-02")
+				keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				redis.Set(keyThree, "", time.Second)
+				defer redis.Close()
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -571,6 +521,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				scheduleDateStartOne := thisTime.Format("2006-01-02")
+				keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+				redis.Set(keyThree, "", time.Second)
+				defer redis.Close()
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -583,13 +543,24 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			dialysisPrescribe.DewaterAmount = dewater_amount
 			dialysisPrescribe.TargetUltrafiltration = dewater_amount
 			dialysisPrescribe.Status = 1
+
 			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			scheduleDateStartOne := thisTime.Format("2006-01-02")
+			keyThree := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			redis.Set(keyThree, "", time.Second)
+			defer redis.Close()
 			if updateErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
 		}
 
-		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
 			c.ErrorLog("获取透前评估失败:%v", getPEErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -609,9 +580,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			evaluation.PatientId = id
 			evaluation.UserOrgId = adminUserInfo.Org.Id
 			// 获取上一次透前评估信息，部分数据是需要从上一次透前评估继承
-			lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluationOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			// 获取上一次透后评估，插入本次透前评估的上次透后体重（weight_after_last_transparency）字段
-			assessmentAfterDislysis, getAADErr := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			assessmentAfterDislysis, getAADErr := service.MobileGetLastTimeAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if getAADErr != nil {
 				c.ErrorLog("获取透后评估失败:%v", getAADErr)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -667,6 +638,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		evaluation.AssessmentTime = time.Now().Unix()
 
 		err := service.UpadatePredialysisEvaluation(&evaluation)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+		assessdateDateStart := thisTime.Format("2006-01-02")
+		keyTwo := "scheduals_" + assessdateDateStart + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 			return
@@ -681,7 +662,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	} else {
 
 		// 保存透后相关数据
-		assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysis(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getAADErr != nil {
 			c.ErrorLog("获取透后评估失败:%v", getAADErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -720,6 +701,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		// }
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
+		assessdateDateStart := thisTime.Format("2006-01-02")
+		keyTwo := "scheduals_" + assessdateDateStart + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": afterevaluation,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -326,7 +326,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	adminInfo := this.GetMobileAdminUserInfo()
 
 	ch := make(chan struct{})
-	count := 25 // count 表示活动的协程个数
+	count := 24 // count 表示活动的协程个数
 	var patient models.Patients
 	var receiverTreatmentAccess *models.ReceiveTreatmentAsses
 	var predialysisEvaluation *models.PredialysisEvaluation
@@ -348,7 +348,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	var stockType []*models.GoodsTypeOne
 	var prepare []*models.XtDialysisBeforePrepare
 	var lastAssessment models.XtPatientVascularAccess
-	var prescribeOne *models.DialysisPrescription
+
 	var lastDryWeightDislysis *models.SgjPatientDryweight
 	var gobalConfig models.GobalConfig
 	var operators []*models.SgjUserAdminRoles
@@ -469,12 +469,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 		ch <- struct{}{}
 	}()
 
-	go func() {
-		// 先走redis，没有走数据库
-		prescribeOne, _ = service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
-		ch <- struct{}{}
-	}()
-
 	go func() {
 		// 先走redis，没有走数据库
 		lastDryWeightDislysis, _ = service.MobileGetLastDryWeight(adminInfo.Org.Id, patientID)
@@ -501,11 +495,14 @@ func (this *DialysisAPIController) DialysisRecord() {
 			close(ch)
 		}
 	}
+
+	prescribeOne, _ := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
+
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
 
-	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
+	_, is_project_open_config = service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
 
-	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+	projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	var team_projects []*models.HisPrescriptionProject
@@ -524,14 +521,11 @@ func (this *DialysisAPIController) DialysisRecord() {
 		}
 	}
 
-	stockType, _ := service.GetStockType(adminInfo.Org.Id)
-
-	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+	stockType, _ = service.GetStockType(adminInfo.Org.Id)
 
-	//获取最后一次血管通路
-	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+	prepare, _ = service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
 
-	prescribeOne, parseDateErr := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
+	prescribeOne, _ = service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		// 先走redis，没有走数据库
@@ -658,7 +652,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
 		redis.Set(keyOne, "", time.Second)
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 		redis.Set(keyThree, "", time.Second)
@@ -688,7 +682,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
 		redis.Set(keyOne, "", time.Second)
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 		redis.Set(keyThree, "", time.Second)
@@ -1141,12 +1135,15 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
-		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyTwo, "", time.Second)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
 		defer redis.Close()
 		if err == nil {
@@ -1168,17 +1165,20 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
-		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+
+		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		redis := service.RedisClient()
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+		redis.Set(keyTwo, "", time.Second)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
-		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
-
 		if err == nil {
-			fmt.Println("hhhhhhhhhhh0000000000", err)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
@@ -1475,9 +1475,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if dialysisPrescription.ID == 0 { //新增
-		//if mode_id > 0 {
-		//	//service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
-		//}
+
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 		}
@@ -1488,7 +1486,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//获取key,清空redis
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
-		defer redis.Close()
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
@@ -1500,7 +1498,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//清空key 值
 		redis.Set(keyTwo, "", time.Second)
 
-		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 		redis.Set(keySix, "", time.Second)
 
 		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
@@ -1509,6 +1507,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if err == nil {
 			updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe_by_mode"
+
 			//清空key 值
 			redis.Set(keyThree, "", time.Second)
 
@@ -1518,6 +1517,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":schedual_detail"
 			redis.Set(keyFive, "", time.Second)
 
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
+			redis.Set(keySix, "", time.Second)
+
 			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
 			redis.Set(keySeven, "", time.Second)
 
@@ -1527,7 +1529,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			if updateErr != nil {
 				utils.ErrorLog("%v", updateErr)
 			}
-
+			defer redis.Close()
 			c.ServeSuccessJSON(map[string]interface{}{
 				"prescription": prescription,
 			})
@@ -1572,7 +1574,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//获取key,清空redis
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
-		defer redis.Close()
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
@@ -1580,16 +1582,19 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
-		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 		redis.Set(keySix, "", time.Second)
 
 		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
 		redis.Set(keySeven, "", time.Second)
+
 		if err == nil {
 			updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
 			keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
 			//清空key 值
 			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
 			if updateErr != nil {
 				utils.ErrorLog("%v", updateErr)
 			}
@@ -1662,7 +1667,7 @@ func (c *DialysisAPIController) Finish() {
 	}
 
 	// 获取当前的最后一条透析纪录
-	endmonitorRecords, getMonitorRecordsErr := service.MobileGetLastMonitorRecord(adminUserInfo.Org.Id, id, recordDate.Unix())
+	endmonitorRecords, getMonitorRecordsErr := service.MobileGetLastMonitorRecordOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 	if getMonitorRecordsErr != nil {
 		c.ErrorLog("获取透析监测记录失败:%v", getMonitorRecordsErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1693,7 +1698,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.PatientId = id
 		tempassessmentAfterDislysis.UserOrgId = adminUserInfo.Org.Id
 	}
-	fmt.Println("上机状态233323232232332322332233232323223", dialysisOrder.Stage)
+
 	if dialysisOrder.Stage == 1 {
 		temp_time := (float64(endDate.Unix()) - float64(dialysisOrder.StartTime)) / 3600
 		value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", temp_time), 64)
@@ -1702,8 +1707,7 @@ func (c *DialysisAPIController) Finish() {
 		c, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", b), 64)
 		hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 		minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", c*60), 10, 64)
-		fmt.Println("323332322332323223232323232323232323", hour)
-		fmt.Println(minute)
+
 		tempassessmentAfterDislysis.ActualTreatmentHour = hour
 		tempassessmentAfterDislysis.ActualTreatmentMinute = minute
 	}
@@ -1727,9 +1731,9 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 {
-		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
+
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 {
+		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
 			pre := models.PredialysisEvaluation{
@@ -1738,9 +1742,11 @@ func (c *DialysisAPIController) Finish() {
 			fmt.Println("prew", pre)
 			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
 
 			redis := service.RedisClient()
 			redis.Set(key, "", time.Second)
+			redis.Set(keyOne, "", time.Second)
 			defer redis.Close()
 			fmt.Println(getNurseErr)
 		}
@@ -1755,7 +1761,7 @@ func (c *DialysisAPIController) Finish() {
 			redis := service.RedisClient()
 			redis.Set(key, "", time.Second)
 
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
 			redis.Set(keyOne, "", time.Second)
 			defer redis.Close()
 			fmt.Println(getNurseErr)
@@ -1770,7 +1776,7 @@ func (c *DialysisAPIController) Finish() {
 
 			redis := service.RedisClient()
 			redis.Set(key, "", time.Second)
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
 			redis.Set(keyOne, "", time.Second)
 			defer redis.Close()
 			fmt.Println(getNurseErr)
@@ -1871,7 +1877,7 @@ func (c *DialysisAPIController) Finish() {
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 	redis := service.RedisClient()
-	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 	redis.Set(keyOne, "", time.Second)
 
 	keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_last"
@@ -1901,7 +1907,7 @@ func (c *DialysisAPIController) Finish() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
 		redis.Set(keyOne, "", time.Second)
 		//结束时候透析次数加1
 		service.UpdateSolutionByPatientId(id)
@@ -2153,10 +2159,9 @@ func (this *DialysisAPIController) StartDialysis() {
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 
 		redis := service.RedisClient()
-		defer redis.Close()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
@@ -2183,7 +2188,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
 	//后期预增脱水量
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
-	fmt.Println(evaluation)
+
 	if prescription.ID > 0 {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
@@ -2261,11 +2266,13 @@ func (this *DialysisAPIController) StartDialysis() {
 	if newdialysisRecord.ID > 0 {
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
+
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_record_list_all"
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
 			return
@@ -2626,7 +2633,7 @@ func (c *DialysisAPIController) PostSolution() {
 	keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":schedual_detail"
 	redis.Set(keyTwo, "", time.Second)
 
-	keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+	keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
 	redis.Set(keyThree, "", time.Second)
 
 	keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
@@ -2991,13 +2998,13 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_order"
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
-	fmt.Println("keyOne23332233223322332322332", keyOne)
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_orders_list_all"
+
 	//清空key 值
 	redis.Set(keyOne, "", time.Second)
 	scheduleDateStartOne := startDate.Format("2006-01-02")
 	keyTwo := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
-	fmt.Println("keyTwo2332323232233223232323", keyTwo)
+
 	redis.Set(keyTwo, "", time.Second)
 
 	keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":doctor_advices"
@@ -3014,7 +3021,6 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":device_list_all"
 	redis.Set(keySeven, "", time.Second)
 
-	defer redis.Close()
 	if updateErr != nil {
 		this.ErrorLog("修改上机失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3031,6 +3037,18 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 			hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 			minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", tempMinute*60), 10, 64)
 			updateAssessmentErr := service.UpdateAssessmentAfterDate(tempDialysisRecord.PatientId, tempDialysisRecord.UserOrgId, tempDialysisRecord.DialysisDate, hour, minute)
+			redis := service.RedisClient()
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":assessment_after_dislysis_list_all"
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecord.PatientId, 10) + ":" + strconv.FormatInt(record_date, 10) + ":assessment_after_dislysis"
+			redis.Set(keyOne, "", time.Second)
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_orders_list_all"
+			//清空key 值
+			redis.Set(keySix, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":monitor_records"
+			redis.Set(keySeven, "", time.Second)
+			redis.Close()
 			if updateAssessmentErr != nil {
 				utils.ErrorLog("%v", updateAssessmentErr)
 			}
@@ -3097,9 +3115,12 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_order"
 	//清空key 值
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_orders_list_all"
 	//清空key 值
 	redis.Set(keyOne, "", time.Second)
+
+	keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":monitor_records"
+	redis.Set(keySeven, "", time.Second)
 	redis.Close()
 	if updateErr != nil {
 		c.ErrorLog("修改下机失败：%v", updateErr)
@@ -3123,11 +3144,14 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":assessment_after_dislysis_last"
 		redis.Set(keyTwo, "", time.Second)
 
-		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":assessment_after_dislysis_list_all"
 
 		redis.Set(key, "", time.Second)
-		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_orders_list_all"
 		redis.Set(keyThree, "", time.Second)
+
+		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":monitor_records"
+		redis.Set(keySeven, "", time.Second)
 		defer redis.Close()
 		if updateAssessmentErr != nil {
 			utils.ErrorLog("%v", updateAssessmentErr)
@@ -3222,10 +3246,11 @@ func (c *DialysisAPIController) GetLongAdvice() {
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status":         "2",
-				"advices":        advices,
-				"advices_two":    RemoveRepeatedElement(advice_three),
-				"is_open_remind": config.IsOpenRemind,
+				"status":          "2",
+				"advices":         advices,
+				"advices_two":     RemoveRepeatedElement(advice_three),
+				"is_open_remind":  config.IsOpenRemind,
+				"his_config_open": hisConfig.IsOpen,
 			})
 		}
 	}
@@ -3535,7 +3560,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
 
 		keyThree := "scheduals_" + adviceDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
@@ -3629,12 +3654,13 @@ func (c *DialysisAPIController) UploadDryWeight() {
 
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
 		redis := service.RedisClient()
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
-		redis.Set(keyOne, "", time.Second)
 		loc, _ := time.LoadLocation("Local")
 		nowTime := time.Now()
 		nowDay := nowTime.Format("2006-01-02")
 		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
 		redis.Set(key, "", time.Second)
 		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
@@ -3845,8 +3871,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 		//查询是否有库存
 		for _, item := range dialysisBefor {
-			warehouse, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
-			fmt.Println("库存数量00000000000000000000", warehouse.StockCount, err)
+			_, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
+
 			if err == gorm.ErrRecordNotFound {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -172,7 +172,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	redis := service.RedisClient()
 	//清空key 值
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_record_list_all"
 	redis.Set(keyOne, "", time.Second)
 	defer redis.Close()
 	if err != nil {
@@ -336,7 +336,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	redis := service.RedisClient()
 	//清空key 值
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_record_list_all"
 	redis.Set(keyOne, "", time.Second)
 
 	defer redis.Close()
@@ -380,7 +380,7 @@ func (this *DialysisAPIController) DeleteMonitor() {
 	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	redis := service.RedisClient()
-	key := strconv.FormatInt(orgid, 10) + ":" + ":monitor_record_list_all"
+	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_record_list_all"
 	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)
@@ -501,27 +501,29 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 			}
 			createErr := service.CreateSchedule(newSchedule)
 			redis := service.RedisClient()
-
+			timeStr := time.Now().Format("2006-01-02")
+			key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			redis.Set(key, "", time.Second)
 			//处方
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":prescriptions_list_all"
 			redis.Set(keyOne, "", time.Second)
 
 			//医嘱
-			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":advice_list_all"
 			redis.Set(keyTwo, "", time.Second)
 
-			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":assessment_befores_list_all"
 			redis.Set(keySix, "", time.Second)
-			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 			redis.Set(keyThree, "", time.Second)
 
-			keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+			keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":monitor_record_list_all"
 			redis.Set(keyFour, "", time.Second)
 
-			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":treatment_summarys_list_all"
 			redis.Set(keyFive, "", time.Second)
 
-			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(scheduleDate.Unix(), 10) + ":dialysis_orders_list_all"
 			redis.Set(keySeven, "", time.Second)
 			redis.Close()
 			if createErr != nil {
@@ -561,6 +563,10 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 					daySchedule.UpdatedTime = time.Now().Unix()
 					err := service.UpdateSchedule(&daySchedule)
 					redis := service.RedisClient()
+
+					timeStr := time.Now().Format("2006-01-02")
+					key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(key, "", time.Second)
 					//处方
 					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
 					redis.Set(keyOne, "", time.Second)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -244,7 +244,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
@@ -327,7 +327,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 				defer redis.Close()
 				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 				redis.Set(keyOne, "", time.Second)
 			}
 		} else if len(adviceSlice) > 1 {
@@ -339,7 +339,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 				defer redis.Close()
 				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 				redis.Set(keyOne, "", time.Second)
 				isChangeGroup = false
 
@@ -352,7 +352,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 				defer redis.Close()
 				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 				redis.Set(keyOne, "", time.Second)
 				isChangeGroup = true
 
@@ -363,7 +363,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 		err = service.UpdateDoctorAdvice(&advice)
 		redis := service.RedisClient()
 		defer redis.Close()
-		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 		redis.Set(keyOne, "", time.Second)
@@ -627,7 +627,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			redis := service.RedisClient()
 			//清空key 值
 			redis.Set(key, "", time.Second)
-			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -638,13 +638,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 			fmt.Println("keyFour323223323232323232", keyFour)
 			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
 			defer redis.Close()
 		} else {
 
 			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()
-			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -654,6 +657,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 			fmt.Println("keyFour323223323232323232", keyFour)
 			redis.Set(keyFour, "", time.Second)
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keySix, "", time.Second)
 			defer redis.Close()
 			//清空key 值
 			redis.Set(key, "", time.Second)
@@ -936,6 +941,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		timeLayout2 := "2006-01-02 15:04:05"
 		loc, _ := time.LoadLocation("Local")
 		theTime, errs := time.ParseInLocation(timeLayout2, execution_time, loc)
+
 		if errs != nil {
 			utils.ErrorLog(errs.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -969,12 +975,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			redis := service.RedisClient()
 			//清空key 值
 			redis.Set(key, "", time.Second)
-			keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
-			keyFour := "scheduals_" + execution_time + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+
 			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
 			defer redis.Close()
 		}
 
@@ -1129,10 +1140,28 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	}
 	var err error
 	if groupno > 0 {
+
 		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"
+		fmt.Println("keyThh322323232323232323223", key)
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		defer redis.Close()
 
 	} else {
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
+		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"
+		fmt.Println("keyTwohh322323232323232323223", key)
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		defer redis.Close()
 	}
 
 	//判断是否开启his
@@ -1144,14 +1173,38 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			UpdatedTime:   time.Now().Unix(),
 		}
 		fmt.Println("ids2323232232323", ids)
+		var advicehis models.HisDoctorAdviceInfo
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+		his_advices, _ := service.FindHisDoctorAdviceByIdOne(adminUserInfo.Org.Id, ids)
+		for _, item := range his_advices {
+			if item.ExecutionState == 1 {
+				advicehis = item
+			}
+		}
+		redis := service.RedisClient()
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advicehis.PatientId, 10) + ":" + strconv.FormatInt(advicehis.AdviceDate, 10) + ":his_doctor_advice"
+		redis.Set(keyThree, "", time.Second)
+		recordDate := theTime.Format("2006-01-02")
+		keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 
+		redis.Set(keyFour, "", time.Second)
+		keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advicehis.AdviceDate, 10) + ":his_advices_list_all"
+		redis.Set(keyFive, "", time.Second)
+		defer redis.Close()
 		project := models.HisPrescriptionProject{
 			ExecutionTime: theTime.Unix(),
 			Mtime:         time.Now().Unix(),
 		}
 		service.ModifyHisPrescriptionProject(&project, ids)
 
+		keyEnd := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advicesinfo.PatientId, 10) + ":" + strconv.FormatInt(advicesinfo.AdviceDate, 10) + ":his_doctor_advice"
+		redis.Set(keyEnd, "", time.Second)
+		keyFours := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+		redis.Set(keyFours, "", time.Second)
+		keyFives := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advicesinfo.AdviceDate, 10) + ":his_advices_list_all"
+		redis.Set(keyFives, "", time.Second)
+		defer redis.Close()
 	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
@@ -1242,9 +1295,19 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			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()
-			defer redis.Close()
 			//清空key 值
 			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
 		} else {
 
 			if len(ids[0]) <= 0 {
@@ -1256,7 +1319,21 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 				//loc, _ := time.LoadLocation("Local")
 				//theTime, _ := time.ParseInLocation(timeLayout2, t, loc)
 				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()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+				defer redis.Close()
 			}
 		}
 
@@ -1292,11 +1369,23 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			item.CheckTime = time.Now().Unix()
 			item.CheckState = 1
 			err = service.SaveHisDoctorAdvice(item)
-			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
-			defer redis.Close()
+			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			//清空key 值
 			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			theTime := time.Now()
+
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1637,7 +1726,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_befores_list_all"
 	redis.Set(keyOne, "", time.Second)
 	keyTwo := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(keyTwo, "", time.Second)
@@ -2047,7 +2136,10 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		blood_access_part_id := dataBody["blood_access_part_id"].(string)
 		evaluation.BloodAccessPartId = blood_access_part_id
 	}
-
+	//if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "float64" {
+	//	blood_access_part_id := int64(dataBody["blood_access_part_id"].(float64))
+	//	evaluation.BloodAccessPartId = blood_access_part_id
+	//}
 	if dataBody["blood_access_part_opera_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_opera_id"]).String() == "float64" {
 		blood_access_part_opera_id := int64(dataBody["blood_access_part_opera_id"].(float64))
 		evaluation.BloodAccessPartOperaId = blood_access_part_opera_id
@@ -2066,6 +2158,9 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
 		evaluation.IsHemorrhage = is_hemorrhage
 
+		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
+		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
+		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}
@@ -2181,8 +2276,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		humor_excessive_symptom, _ := dataBody["humor_excessive_symptom"].(string)
 
-	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "string" {
-		humor_excessive_symptom := dataBody["humor_excessive_symptom"].(string)
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 
@@ -2621,7 +2714,7 @@ func (c *PatientApiController) GetPatientMonitor() {
 			//获取透前评估
 			assessmentBefores, _ := service.GetAllAssessmentBeforesByListOne(orgID, theStartTime)
 			//获取上机
-			dialysisOrders, _ := service.GetAllDialysisOrdersByListOne(orgID, theStartTime)
+			dialysisOrders, _ := service.GetAllDialysisOrdersByListSix(orgID, theStartTime)
 			//获取透后
 			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListOne(orgID, theStartTime)
 
@@ -3164,7 +3257,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
 
 		defer redis.Close()
@@ -3237,7 +3330,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		redis := service.RedisClient()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
 		fmt.Println("key`2232333332233223233232", key)
 		defer redis.Close()
@@ -3376,7 +3469,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 		redis.Set(key, "", time.Second)
 
-		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 		redis.Set(keyTwo, "", time.Second)
 		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)
@@ -3440,7 +3533,8 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			redis.Set(key, "", time.Second)
 
-			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
+
 			redis.Set(keyTwo, "", time.Second)
 			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)
@@ -3451,7 +3545,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			redis.Set(key, "", time.Second)
 			fmt.Println("key2332323223323232323232323", key)
-			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
 			fmt.Println("key2332323223323232323232323", keyTwo)
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -273,6 +273,7 @@ func (c *MobileHisApiController) DeletePrescription() {
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
+
 	if err == nil {
 		if len(projects) > 0 {
 			for _, item := range projects {
@@ -303,6 +304,10 @@ func (c *MobileHisApiController) DeletePrescription() {
 					if item.PrescribingNumberUnit == drug.MinUnit {
 						drug.Total = drug.Total + item.PrescribingNumber
 						service.UpdateBaseDrugLib(&drug)
+						redis := service.RedisClient()
+						keyFive := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+						redis.Set(keyFive, "", time.Second)
+						defer redis.Close()
 					} else {
 						if item.PrescribingNumberUnit == drug.MaxUnit {
 							item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
@@ -721,6 +726,15 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 								return
 							}
 							service.CreateHisDoctorAdvice(&s)
+							redis := service.RedisClient()
+							key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+							fmt.Println("key111111111111111111", key)
+							redis.Set(key, "", time.Second)
+							keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							redis.Set(keyOne, "", time.Second)
+							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+							redis.Set(keySeven, "", time.Second)
+							redis.Close()
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
 							timestamp := time.Now().Unix()
@@ -729,6 +743,13 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 							service.CreateHisDoctorAdvice(&s)
 
+							redis.Set(key, "", time.Second)
+							keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							redis.Set(keyTwo, "", time.Second)
+							keyThree := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+							redis.Set(keyThree, "", time.Second)
+							redis.Close()
+
 						}
 					}
 				}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -310,6 +310,37 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
 	err := service.DeleteSchedule(id)
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+	schedule, _ := service.GetSchedule(org_id, id)
+	if schedule == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeScheduleNotExist)
+		return
+	}
+	redis := service.RedisClient()
+
+	//处方
+	keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	//医嘱
+	keyTwo := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+	redis.Set(keyTwo, "", time.Second)
+
+	keySix := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+	redis.Set(keySix, "", time.Second)
+	keyThree := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	redis.Set(keyThree, "", time.Second)
+
+	keyFour := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+	redis.Set(keyFive, "", time.Second)
+
+	keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+	redis.Set(keySeven, "", time.Second)
+	fmt.Println(err)
+	defer redis.Close()
 	fmt.Println(err)
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"

controllers/patient_api_controller.go

@@ -1418,7 +1418,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
@@ -1506,7 +1506,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
-	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
@@ -1650,8 +1650,46 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 		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"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+
+			theTimes := theTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
 		} else {
 			err = service.ExceDoctorAdviceById(&exceAdvice, id, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+
+			theTimes := theTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
 		}
 
 		if err != nil {
@@ -1669,19 +1707,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("999999992322322323232", drugStockConfig.IsOpen)
+
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("drugStockConfig2323232332232332", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			var total int64
 			var prescribing_number_total int64
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-				fmt.Println("imte00000000000000", item.PrescribingNumber)
+
 				//查询该药品是否有库存
 				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-				fmt.Println("list23232323232232323232323232", list)
+
 				//查询改药品信息
 				medical, _ := service.GetBaseDrugMedical(item.DrugId)
 				//判断单位是否相等
@@ -1832,8 +1870,46 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+
+			theTimes := theTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+			fmt.Println("keyFour323223323232323232", keyFour)
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
 		} else {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, id, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+
+			theTimes := theTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTimes + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+			fmt.Println("keyFour323223323232323232", keyFour)
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
 		}
 
 		if err != nil {
@@ -2035,8 +2111,36 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		var err error
 		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"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
 		} else {
 			err = service.CheckDoctorAdviceById(&exceAdvice, id, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
 		}
 
 		if err != nil {
@@ -2094,8 +2198,36 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		var err error
 		if advice.ParentId > 0 {
 			err = service.CheckHisDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
 		} else {
 			err = service.CheckHisDoctorAdviceById(&exceAdvice, id, patient)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
 		}
 
 		if err != nil {
@@ -2170,11 +2302,15 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 
 	err := service.UpdateDoctorAdvice(&advice)
 	redis := service.RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
 	redis.Set(key, "", time.Second)
+	fmt.Println("key2332233232322332", key)
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 	redis.Set(keyOne, "", time.Second)
+	fmt.Println("key3333333333333333", keyOne)
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return
@@ -2377,6 +2513,10 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	err := service.DeleteDoctorAdvice(&advice)
+	redis := service.RedisClient()
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+	redis.Set(key, "", time.Second)
+	redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
 		return
@@ -2416,6 +2556,13 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	//}
 
 	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"
+	redis := service.RedisClient()
+
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+	redis.Set(keyOne, "", time.Second)
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
 		return
@@ -4495,6 +4642,19 @@ func (c *PatientApiController) SaveEditAdvices() {
 		StartTime: theTime.Unix(),
 	}
 	err := service.UpdateDoctorEditAdvice(advice, orgid, groupno, date, patient_id)
+	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(date, 10) + ":doctor_advices"
+	redis := service.RedisClient()
+
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(date, 10) + ":advice_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	scheduleTime := theTime.Format("2006-01-02")
+	keyFour := "scheduals_" + scheduleTime + "_" + strconv.FormatInt(orgid, 10)
+	fmt.Println("keyFour323223323232323232", keyFour)
+	redis.Set(keyFour, "", time.Second)
+
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/schedule_api_controller.go

@@ -372,25 +372,25 @@ func (c *ScheduleApiController) CreateSchedule() {
 
 	redis.Set(key, "", time.Second)
 	//处方
-	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
 	redis.Set(keyOne, "", time.Second)
 
 	//医嘱
-	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
 	redis.Set(keyTwo, "", time.Second)
 
-	keySix := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+	keySix := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
 	redis.Set(keySix, "", time.Second)
-	keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+	keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
 	redis.Set(keyThree, "", time.Second)
 
-	keyFour := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":monitor_record_list_all"
+	keyFour := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
 	redis.Set(keyFour, "", time.Second)
 
-	keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":treatment_summarys_list_all"
+	keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
 	redis.Set(keyFive, "", time.Second)
 
-	keySeven := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	keySeven := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
 	redis.Set(keySeven, "", time.Second)
 	fmt.Println(err)
 	defer redis.Close()
@@ -436,6 +436,31 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	schedule.Status = 0
 	schedule.UpdatedTime = time.Now().Unix()
 	err = service.UpdateSchedule(schedule)
+	redis := service.RedisClient()
+
+	//处方
+	keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	//医嘱
+	keyTwo := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+	redis.Set(keyTwo, "", time.Second)
+
+	keySix := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+	redis.Set(keySix, "", time.Second)
+	keyThree := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	redis.Set(keyThree, "", time.Second)
+
+	keyFour := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+	redis.Set(keyFive, "", time.Second)
+
+	keySeven := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+	redis.Set(keySeven, "", time.Second)
+	fmt.Println(err)
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteScheduleFail)
 		return

controllers/stock_in_api_controller.go

@@ -1698,8 +1698,9 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
 			fmt.Println("item2332323232323", item.ProductDate, item.ExpiryDate)
+
 			//1.查询该耗材该批次的最后一次出库记录
-			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId)
+			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
 
 			// 退库的库存和该耗材该批次最后一次出库数量进行比较
 			//如果退库数量大于 最后一次批次的数量(要么要进行出库)

models/good_models.go

@@ -81,7 +81,6 @@ type GoodInfo struct {
 	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
 	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
-	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (GoodInfo) TableName() string {

models/his_charge_models.go

@@ -204,31 +204,6 @@ func (HisLabelPrintInfo) TableName() string {
 	return "his_label_print_info"
 }
 
-type HisLabelPrintInfo struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Number      string `gorm:"column:number" json:"number" form:"number"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	DoctorId    int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
-	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsPrint     int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
-	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	ItemId      int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PProjectId  int64  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
-
-	FeedetlSn   string `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	DoctorName  string `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`
-	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
-}
-
-func (HisLabelPrintInfo) TableName() string {
-	return "his_label_print_info"
-}
-
 type HisFapiaoRecord struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	FapiaoCode   string `gorm:"column:fapiao_code" json:"fapiao_code" form:"fapiao_code"`

models/his_models.go

@@ -776,10 +776,6 @@ type HisPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
 	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
 	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
@@ -1066,49 +1062,6 @@ func (HisOrderInfoTwo) TableName() string {
 	return "his_order_info"
 }
 
-type HisOrderInfoTwo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
-	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
-	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
-	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
-	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
-	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
-	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
-
-	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
-	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
-}
-
-func (HisOrderInfoTwo) TableName() string {
-	return "his_order_info"
-}
-
 type VMHisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`

models/patient_models.go

@@ -309,14 +309,13 @@ type DialysisPrescription struct {
 	OxygenUptake               int64         `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
 	OxygenFlow                 string        `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string        `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
-
-	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
-	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
-	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
-	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
-	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
-	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
-	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	HemodialysisPipelines      string        `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64       `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string        `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64       `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string        `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -324,24 +323,104 @@ func (DialysisPrescription) TableName() string {
 }
 
 type DialysisPrescriptionList struct {
-	ID                         int64   `gorm:"column:id" json:"id"`
-	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id"`
-	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
-	RecordId                   int64   `gorm:"column:record_id" json:"record_id"`
-	Creater                    int64   `gorm:"column:creater" json:"creater"`
+	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
+	MachineType                string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	DewaterAmount              float64 `gorm:"column:dewater_amount" json:"dewater_amount" form:"dewater_amount"`
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
-	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
-	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
+	PrescriptionDewatering     float64 `gorm:"column:prescription_dewatering" json:"prescription_dewatering" form:"prescription_dewatering"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	AnticoagulantGaimingcheng  string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	AnticoagulantGaijiliang    string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
+	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total" form:"replacement_total"`
+	ReplacementWay             int64   `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
+	HemodialysisMachine        int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
+	BloodFilter                int64   `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
+	PerfusionApparatus         int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	DryWeight                  float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	VascularAccessMode         int64   `gorm:"column:vascular_access_mode" json:"vascular_access_mode" form:"vascular_access_mode"`
+	VascularAccess             int64   `gorm:"column:vascular_access" json:"vascular_access" form:"vascular_access"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	DisplaceLiqui              float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
+	Kalium                     float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium                     float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                    float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Bicarbonate                float64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Glucose                    float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	DialysateTemperature       float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
+	Conductivity               float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
+	PrescriptionDoctor         int64   `gorm:"column:prescription_doctor" json:"prescription_doctor" form:"prescription_doctor"`
+	Creater                    int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier                   int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	RecordId                   int64   `gorm:"column:record_id" json:"record_id" form:"record_id"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
+	BodyFluid                  int64   `gorm:"column:body_fluid" json:"body_fluid" form:"body_fluid"`
+	SpecialMedicine            int64   `gorm:"column:special_medicine" json:"special_medicine" form:"special_medicine"`
+	SpecialMedicineOther       string  `gorm:"column:special_medicine_other" json:"special_medicine_other" form:"special_medicine_other"`
+	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
+	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
+	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
+	Niprocart                  int64   `gorm:"column:niprocart" json:"niprocart" form:"niprocart"`
+	Jms                        int64   `gorm:"column:jms" json:"jms" form:"jms"`
+	FistulaNeedleSet           int64   `gorm:"column:fistula_needle_set" json:"fistula_needle_set" form:"fistula_needle_set"`
+	FistulaNeedleSet16         int64   `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16" form:"fistula_needle_set_16"`
+	Hemoperfusion              int64   `gorm:"column:hemoperfusion" json:"hemoperfusion" form:"hemoperfusion"`
+	DialyserSterilised         int64   `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised" form:"dialyser_sterilised"`
+	Filtryzer                  int64   `gorm:"column:filtryzer" json:"filtryzer" form:"filtryzer"`
+	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	Dialyzers                  int64   `gorm:"column:dialyzers" json:"dialyzers" form:"dialyzers"`
+	Injector                   int64   `gorm:"column:injector" json:"injector" form:"injector"`
+	Bloodlines                 int64   `gorm:"column:bloodlines" json:"bloodlines" form:"bloodlines"`
+	TubingHemodialysis         int64   `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis" form:"tubing_hemodialysis"`
+	Package                    int64   `gorm:"column:package" json:"package" form:"package"`
+	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
+	PreImpulse                 float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	HeparinSodium              string  `gorm:"column:heparin_sodium" json:"heparin_sodium" form:"heparin_sodium"`
+	Nucleoprotamine            string  `gorm:"column:nucleoprotamine" json:"nucleoprotamine" form:"nucleoprotamine"`
+	PushTheProtamine           string  `gorm:"column:push_the_protamine" json:"push_the_protamine" form:"push_the_protamine"`
+	NoHeparinRemarks           string  `gorm:"column:no_heparin_remarks" json:"no_heparin_remarks" form:"no_heparin_remarks"`
+	Blood                      string  `gorm:"column:blood" json:"blood" form:"blood"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	AntioxidantCommodityName   string  `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
+	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	SingleTime                 string  `gorm:"column:single_time" json:"single_time" form:"single_time"`
+	SingleWater                string  `gorm:"column:single_water" json:"single_water" form:"single_water"`
+	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
+	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -1388,3 +1467,41 @@ type MsDeviceZone struct {
 func (MsDeviceZone) TableName() string {
 	return "xt_device_zone"
 }
+
+type XtHospitalSummary struct {
+	ID                       int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId                int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdmissionTime            int64  `gorm:"column:admission_time" json:"admission_time" form:"admission_time"`
+	DischargeTime            int64  `gorm:"column:discharge_time" json:"discharge_time" form:"discharge_time"`
+	SickPersonnel            string `gorm:"column:sick_personnel" json:"sick_personnel" form:"sick_personnel"`
+	Xray                     string `gorm:"column:xray" json:"xray" form:"xray"`
+	Connecticut              string `gorm:"column:connecticut" json:"connecticut" form:"connecticut"`
+	NuclearMagneticResonance string `gorm:"column:nuclear_magnetic_resonance" json:"nuclear_magnetic_resonance" form:"nuclear_magnetic_resonance"`
+	Ultrasound               string `gorm:"column:ultrasound" json:"ultrasound" form:"ultrasound"`
+	Pathology                string `gorm:"column:pathology" json:"pathology" form:"pathology"`
+	AdmittingDiagnosisId     string `gorm:"column:admitting_diagnosis_id" json:"admitting_diagnosis_id" form:"admitting_diagnosis_id"`
+	AdmittingDiagnosis       string `gorm:"column:admitting_diagnosis" json:"admitting_diagnosis" form:"admitting_diagnosis"`
+	DischargeDiagnosisId     string `gorm:"column:discharge_diagnosis_id" json:"discharge_diagnosis_id" form:"discharge_diagnosis_id"`
+	DischargeDiagnosis       string `gorm:"column:discharge_diagnosis" json:"discharge_diagnosis" form:"discharge_diagnosis"`
+	DiagnosisAdmissionId     string `gorm:"column:diagnosis_admission_id" json:"diagnosis_admission_id" form:"diagnosis_admission_id"`
+	DiagnosisAdmission       string `gorm:"column:diagnosis_admission" json:"diagnosis_admission" form:"diagnosis_admission"`
+	TreatmentId              string `gorm:"column:treatment_id" json:"treatment_id" form:"treatment_id"`
+	Treatment                string `gorm:"column:treatment" json:"treatment" form:"treatment"`
+	IllnessDischargeId       string `gorm:"column:illness_discharge_id" json:"illness_discharge_id" form:"illness_discharge_id"`
+	IllnessDischarge         string `gorm:"column:illness_discharge" json:"illness_discharge" form:"illness_discharge"`
+	DischargeAdviceId        string `gorm:"column:discharge_advice_id" json:"discharge_advice_id" form:"discharge_advice_id"`
+	DischargeAdvice          string `gorm:"column:discharge_advice" json:"discharge_advice" form:"discharge_advice"`
+	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"`
+	RecordTime               int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	Title                    string `gorm:"column:title" json:"title" form:"title"`
+	Doctor                   int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	RecordDate               int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DeanId                   int64  `gorm:"column:dean_id" json:"dean_id" form:"dean_id"`
+}
+
+func (XtHospitalSummary) TableName() string {
+	return "xt_hospital_summary"
+}

models/stock_models.go

@@ -1145,22 +1145,3 @@ type PatientWarehouseInfo struct {
 func (PatientWarehouseInfo) TableName() string {
 	return "xt_warehouse_info"
 }
-
-type PatientWarehouseInfo struct {
-	ID                int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Number            string `gorm:"column:number" json:"number" form:"number"`
-	ProductDate       int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate        int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingUnit   string `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	GoodName          string `gorm:"column:good_name" json:"good_name"`
-	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
-}
-
-func (PatientWarehouseInfo) TableName() string {
-	return "xt_warehouse_info"
-}

service/dialysis_service.go

@@ -274,7 +274,12 @@ func AddSigleDoubleCheck(check *models.DoubleCheck) (err error) {
 
 //修改透析处方
 func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescription) error {
+	tx := writeDb.Begin()
 	err := writeDb.Save(&dialysisPrescription).Error
+	if err != nil {
+		tx.Rollback()
+	}
+	tx.Commit()
 	return err
 }
 
@@ -1370,6 +1375,11 @@ func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (er
 	return err
 }
 
+func FindHisDoctorAdviceByIdOne(orgID int64, ids []string) (advice []models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id IN (?) AND user_org_id = ? AND status = 1", ids, orgID).Find(&advice).Error
+	return
+}
+
 func ModifyHisPrescriptionProject(m *models.HisPrescriptionProject, ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
@@ -1438,7 +1448,8 @@ func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList,
 func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDoctorAdvice, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":advice_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":advice_list_all"
+
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -1478,7 +1489,7 @@ func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDocto
 func GetAllPcDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVMList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	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
@@ -1516,7 +1527,7 @@ func GetAllPcDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrde
 func GetAllPcAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*AssessmentAfterDislysis, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -1556,7 +1567,7 @@ func GetAllPcAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (ass
 func GetAllPcTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSummarys []*VMTreatmentSummary, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":treatment_summarys_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":treatment_summarys_list_all"
 	treatment_summarys_all, _ := redis.Get(key).Result()
 
 	if len(treatment_summarys_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/gobal_config_service.go

@@ -590,7 +590,7 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (drug []*models.VmBaseDrug, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := readDb2.Table("xt_base_drug").Where("status = 1")
+	db := XTReadDB().Table("xt_base_drug").Where("status = 1")
 	likeKey := "%" + keyword + "%"
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
@@ -727,7 +727,7 @@ func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models
 }
 
 func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
-	db := readDb2.Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -743,7 +743,7 @@ func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*mo
 }
 
 func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugAutomaticReduceDetail, err error) {
-	db := readDb2.Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.record_time >=?", startime)
@@ -761,7 +761,7 @@ func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*m
 
 func GetCancelDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
 
-	db := readDb2.Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
+	db := XTReadDB().Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)

service/manage_center_service.go

@@ -173,6 +173,28 @@ func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err
 	return
 }
 
+func GetDrugAutoWarehouseOut(patient_id int64, advicedate int64, drugid int64) (*models.DrugWarehouseOutInfo, error) {
+	detail := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1", patient_id, advicedate, drugid).Find(&detail).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &detail, nil
+}
+
+func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
+	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+	return err
+}
+
+func UpdateDrugWarehouseOne(id int64, info models.DrugWarehouseInfo) error {
+	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+	return err
+}
+
 func GetBaseDrugLibList(org_id int64, keyword string, page int64, limit int64, is_use int64, is_charge int64, is_inject int64, manufacturer int64, isRecord int64) (list []*models.BaseDrugLib, total int64, err error) {
 
 	db := readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id)

service/mobile_dialysis_service.go

@@ -590,6 +590,21 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 	}
 }
 
+// 透前评估
+func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64, recordDate int64) (*models.PredialysisEvaluation, error) {
+	fmt.Println("recordDate", recordDate)
+	var record models.PredialysisEvaluation
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 // 透前评估
 func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int64) (*models.PredialysisEvaluation, error) {
 
@@ -632,6 +647,20 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 	}
 }
 
+// 获取 maxDate 之前一次的透前评估记录
+func MobileGetLastTimePredialysisEvaluationOne(orgID int64, patientID int64, maxDate int64) (*models.PredialysisEvaluation, error) {
+	var record models.PredialysisEvaluation
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 // 获取 maxDate 之前一次的透前评估记录
 func MobileGetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDate int64) (*models.PredialysisEvaluation, error) {
 	var record models.PredialysisEvaluation
@@ -701,9 +730,9 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":doctor_advices"
-	fmt.Println("医嘱keyh23232323223", key)
+
 	doctor_advices_str, _ := redis.Get(key).Result()
-	fmt.Println("长度hh2332233232233232", len(doctor_advices_str))
+
 	if len(doctor_advices_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DoctorAdvice{}).
 			Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 || advice_type = 3)", patientID, orgID, recordDate).
@@ -837,7 +866,7 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":monitor_records"
 	monitor_records_str, _ := redis.Get(key).Result()
-	fmt.Println("监测23323232323233232", len(monitor_records_str))
+
 	if len(monitor_records_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, recordDate).Order("operate_time asc").Find(&records).Error
 		if err != nil {
@@ -881,6 +910,19 @@ func MobileGetMonitorRecordFirst(orgID int64, patientID int64, recordDate int64)
 	return &records, nil
 }
 
+func MobileGetLastMonitorRecordOne(orgID int64, patientID int64, beforeDate int64) (*models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func MobileGetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64) (*models.MonitoringRecord, error) {
 	var record models.MonitoringRecord
 	redis := RedisClient()
@@ -1057,7 +1099,7 @@ func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
-					fmt.Println("创建成功没有", treatment_summary_str)
+
 					redis.Set(key, "null", time.Second*60*60*18)
 				}
 				return nil, nil
@@ -1090,7 +1132,7 @@ func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (
 // 透析处方
 func MobileGetDialysisPrescribe(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
-	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -1955,7 +1997,6 @@ func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDry
 	redis := RedisClient()
 	defer redis.Close()
 
-	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":last_dry_weight"
 	last_dry_weight_str, _ := redis.Get(key).Result()
 
@@ -2100,52 +2141,65 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 
 func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":dialysis_prescribe_by_mode"
-	dialysis_prescribe_by_mode_str, _ := redis.Get(key).Result()
-
-	if len(dialysis_prescribe_by_mode_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if record.ID <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-
-			if record.ID > 0 {
-				//缓存数据
-				dialysis_prescribe_by_mode_str, err := json.Marshal(record)
-
-				if err == nil {
-					redis.Set(key, dialysis_prescribe_by_mode_str, time.Second*60*60*18)
-					return nil, err
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-				return nil, err
-			}
-			return &record, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if dialysis_prescribe_by_mode_str == "null" {
-			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
-			return &record, nil
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
 		} else {
-			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
-			return &record, nil
+			return nil, err
 		}
-
 	}
+	return &record, nil
 }
 
+//func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
+//	var record models.DialysisPrescription
+//	redis := RedisClient()
+//	defer redis.Close()
+//
+//	// cur_date := time.Now().Format("2006-01-02")
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":dialysis_prescribe_by_mode"
+//	dialysis_prescribe_by_mode_str, _ := redis.Get(key).Result()
+//
+//	if len(dialysis_prescribe_by_mode_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				if record.ID <= 0 {
+//					redis.Set(key, "null", time.Second*60*60*18)
+//				}
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//
+//			if record.ID > 0 {
+//				//缓存数据
+//				dialysis_prescribe_by_mode_str, err := json.Marshal(record)
+//
+//				if err == nil {
+//					redis.Set(key, dialysis_prescribe_by_mode_str, time.Second*60*60*18)
+//					return nil, err
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//				return nil, err
+//			}
+//			return &record, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if dialysis_prescribe_by_mode_str == "null" {
+//			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
+//			return &record, nil
+//		} else {
+//			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
+//			return &record, nil
+//		}
+//
+//	}
+//}
+
 func MobileGetLastDialysisPrescribe(orgID int64, patientID int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 ", patientID, orgID).Last(&record).Error

service/patient_service.go

@@ -162,7 +162,7 @@ func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, e
 func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMDoctorAdviceForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":advice_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":advice_list_all"
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -202,9 +202,9 @@ func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMD
 func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
 	prescriptions_list_all, _ := redis.Get(key).Result()
-	fmt.Println("铲毒23322332323232323", len(prescriptions_list_all))
+
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
 		if err != nil {
@@ -242,7 +242,7 @@ func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions [
 func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluationList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_befores_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_befores_list_all"
 	assessment_befores_list_all, _ := redis.Get(key).Result()
 
 	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -282,9 +282,9 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*models.MDialysisOrderForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-	fmt.Println("dialysis_orders_list_all23323223232323323232332", len(dialysis_orders_list_all))
+
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 
@@ -320,7 +320,7 @@ func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders
 func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSummarys []*models.VMTreatmentSummaryForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":treatment_summarys_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":treatment_summarys_list_all"
 	treatment_summarys_all, _ := redis.Get(key).Result()
 
 	if len(treatment_summarys_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -359,7 +359,7 @@ func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSu
 func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -399,9 +399,9 @@ func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (asses
 func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":his_advices_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":his_advices_list_all"
 	his_advices_all, _ := redis.Get(key).Result()
-
+	fmt.Println("hish233232222332232323232323", len(his_advices_all))
 	if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
 		if err != nil {
@@ -1958,3 +1958,584 @@ func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, st
 	return
 
 }
+
+func GetAllDeviceNumberByList(orgID int64) (number []*models.DeviceNumber, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":device_number_all"
+	number_info_str, _ := redis.Get(key).Result()
+	if len(number_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DeviceNumber{}).Where("org_id=? and status=1", orgID).Find(&number).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(number) > 0 {
+				//缓存数据
+				device_number_json, err := json.Marshal(&number)
+				if err == nil {
+					redis.Set(key, device_number_json, time.Second*60*60*18)
+				}
+			}
+			return number, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(number_info_str), &number)
+		return number, nil
+	}
+}
+
+func GetAllPrescriptionByListTwo(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescription, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	prescriptions_list_all, _ := redis.Get(key).Result()
+
+	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(prescriptions) > 0 {
+				//缓存数据
+				prescriptions_list_all, err := json.Marshal(&prescriptions)
+				if err == nil {
+					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+				}
+			}
+			return prescriptions, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+		return prescriptions, nil
+	}
+}
+
+func GetAllAssessmentBeforesByListThree(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluation, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_befores_list_all"
+	assessment_befores_list_all, _ := redis.Get(key).Result()
+
+	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(assessmentBefores) > 0 {
+				//缓存数据
+				assessment_befores_list_all, err := json.Marshal(&assessmentBefores)
+				if err == nil {
+					redis.Set(key, assessment_befores_list_all, time.Second*60*60*18)
+				}
+			}
+			return assessmentBefores, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
+		return assessmentBefores, nil
+	}
+}
+
+func GetAllDialysisOrdersByListThree(orgID int64, scheduleDate int64) (dialysisOrders []*models.MonitorDialysisOrder, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	dialysis_orders_list_all, _ := redis.Get(key).Result()
+
+	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.MonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(dialysisOrders) > 0 {
+				//缓存数据
+				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+				if err == nil {
+					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+				}
+			}
+			return dialysisOrders, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+		return dialysisOrders, nil
+	}
+}
+
+func GetAllAssessmentAfterDislysisByListThree(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.AssessmentAfterDislysis, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
+	assessment_after_dislysis__all, _ := redis.Get(key).Result()
+
+	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(assessmentAfterDislysis) > 0 {
+				//缓存数据
+				assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
+				if err == nil {
+					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+				}
+			}
+			return assessmentAfterDislysis, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+		return assessmentAfterDislysis, nil
+	}
+}
+
+func GetAllMonitorListThree(orgID int64, scheduleDate int64) (monitor []*models.MonitoringRecord, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":monitor_record_list_all"
+	monitor_record_list_all, _ := redis.Get(key).Result()
+
+	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.MonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(monitor) > 0 {
+				//缓存数据
+				assessment_after_dislysis__all, err := json.Marshal(&monitor)
+				if err == nil {
+					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+				}
+			}
+			return monitor, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(monitor_record_list_all), &monitor)
+		return monitor, nil
+	}
+}
+
+func GetAllPatientListByListThree(orgID int64) (patients []*models.MonitorPatients, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	patient_info_str, _ := redis.Get(key).Result()
+
+	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.MonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(patients) > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&patients)
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			}
+			return patients, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(patient_info_str), &patients)
+		return patients, nil
+	}
+}
+
+func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	dialysis_orders_list_all, _ := redis.Get(key).Result()
+
+	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(dialysisOrders) > 0 {
+				//缓存数据
+				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+				if err == nil {
+					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+				}
+			}
+			return dialysisOrders, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+		return dialysisOrders, nil
+	}
+}
+
+func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":device_zone_all"
+	zone_info_str, _ := redis.Get(key).Result()
+	if len(zone_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DeviceZone{}).Where("org_id=? and status=1", orgID).Find(&zone).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(zone) > 0 {
+				//缓存数据
+				zone_number_json, err := json.Marshal(&zone)
+				if err == nil {
+					redis.Set(key, zone_number_json, time.Second*60*60*18)
+				}
+			}
+			return zone, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(zone_info_str), &zone)
+		return zone, nil
+	}
+}
+
+func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+	prescriptions_list_all, _ := redis.Get(key).Result()
+
+	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMDialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(prescriptions) > 0 {
+				//缓存数据
+				prescriptions_list_all, err := json.Marshal(&prescriptions)
+				if err == nil {
+					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+				}
+			}
+			return prescriptions, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+		return prescriptions, nil
+	}
+}
+
+func GetAllAssessmentBeforesByListOne(orgID int64, scheduleDate int64) (assessmentBefores []*models.VMPredialysisEvaluation, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_befores_list_all"
+	assessment_befores_list_all, _ := redis.Get(key).Result()
+
+	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMPredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(assessmentBefores) > 0 {
+				//缓存数据
+				assessment_befores_list_all, err := json.Marshal(&assessmentBefores)
+				if err == nil {
+					redis.Set(key, assessment_befores_list_all, time.Second*60*60*18)
+				}
+			}
+			return assessmentBefores, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
+		return assessmentBefores, nil
+	}
+}
+
+func GetAllDialysisOrdersByListSix(orgID int64, scheduleDate int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
+
+	err = readDb.Model(&models.VMMonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+
+	return dialysisOrders, err
+}
+
+func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
+	redis := RedisClient()
+
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
+	fmt.Println("key22332323232323223", key)
+	dialysis_orders_list_all, _ := redis.Get(key).Result()
+	defer redis.Close()
+	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMMonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(dialysisOrders) > 0 {
+				//缓存数据
+				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+				if err == nil {
+					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+				}
+			}
+			return dialysisOrders, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+		return dialysisOrders, nil
+	}
+}
+
+func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	assessment_after_dislysis__all, _ := redis.Get(key).Result()
+
+	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(assessmentAfterDislysis) > 0 {
+				//缓存数据
+				assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
+				if err == nil {
+					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+				}
+			}
+			return assessmentAfterDislysis, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+		return assessmentAfterDislysis, nil
+	}
+}
+
+func GetAllMonitorList(orgID int64, scheduleDate int64) (monitor []*models.VMMonitoringRecord, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_record_list_all"
+	monitor_record_list_all, _ := redis.Get(key).Result()
+	fmt.Println("monitor_recorde_list", len(monitor_record_list_all))
+	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(monitor) > 0 {
+				//缓存数据
+				assessment_after_dislysis__all, err := json.Marshal(&monitor)
+				if err == nil {
+					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+				}
+			}
+			return monitor, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(monitor_record_list_all), &monitor)
+		return monitor, nil
+	}
+}
+
+func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatients, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	patient_info_str, _ := redis.Get(key).Result()
+
+	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(patients) > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&patients)
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			}
+			return patients, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(patient_info_str), &patients)
+		return patients, nil
+	}
+}
+
+func GetAllTreatModeByList(orgID int64) (treatement []*models.TreatmentMode, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":treatement_mode_all"
+	treatment_info_str, _ := redis.Get(key).Result()
+
+	if len(treatment_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.TreatmentMode{}).Where("status=1").Find(&treatement).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(treatement) > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&treatement)
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			}
+			return treatement, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(treatment_info_str), &treatement)
+		return treatement, nil
+	}
+}
+
+func GetAllPatientListByListTwo(orgID int64) (patients []*MSchedualPatientVM, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	patient_info_str, _ := redis.Get(key).Result()
+
+	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(patients) > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&patients)
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			}
+			return patients, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(patient_info_str), &patients)
+		return patients, nil
+	}
+}
+
+func GetAllDeviceNumberByListOne(orgID int64) (number []*MDeviceNumberVM, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":device_number_all"
+	number_info_str, _ := redis.Get(key).Result()
+	if len(number_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&MDeviceNumberVM{}).Where("org_id=? and status=1", orgID).Find(&number).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(number) > 0 {
+				//缓存数据
+				device_number_json, err := json.Marshal(&number)
+				if err == nil {
+					redis.Set(key, device_number_json, time.Second*60*60*18)
+				}
+			}
+			return number, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(number_info_str), &number)
+		return number, nil
+	}
+}
+
+func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	prescriptions_list_all, _ := redis.Get(key).Result()
+
+	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(prescriptions) > 0 {
+				//缓存数据
+				prescriptions_list_all, err := json.Marshal(&prescriptions)
+				if err == nil {
+					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+				}
+			}
+			return prescriptions, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+		return prescriptions, nil
+	}
+}

service/patientmanage_service.go

@@ -1836,3 +1836,46 @@ func DeleteSummary(ids []string) error {
 	err := XTWriteDB().Model(&summary).Where("id in(?)", ids).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func CreateHisSummary(summary *models.XtHospitalSummary) error {
+
+	err := XTReadDB().Create(&summary).Error
+	return err
+}
+
+func GetHospitalSummaryList(orgid int64, patient_id int64, startime int64, endtime int64) (list []*models.XtHospitalSummary, err error) {
+
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("record_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("record_date >=?", endtime)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	err = db.Find(&list).Order("ctime desc").Error
+	return list, err
+}
+
+func GetHospitalSummaryDetail(id int64) (models.XtHospitalSummary, error) {
+
+	summary := models.XtHospitalSummary{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&summary).Error
+	return summary, err
+}
+
+func UpdateHospital(id int64, summary models.XtHospitalSummary) error {
+
+	err := XTWriteDB().Model(&summary).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": summary.Title, "admission_time": summary.AdmissionTime, "discharge_time": summary.DischargeTime, "sick_personnel": summary.SickPersonnel, "xray": summary.Xray, "connecticut": summary.Connecticut, "nuclear_magnetic_resonance": summary.NuclearMagneticResonance, "ultrasound": summary.Ultrasound, "pathology": summary.Pathology, "admitting_diagnosis_id": summary.AdmittingDiagnosisId, "admitting_diagnosis": summary.AdmittingDiagnosis, "discharge_diagnosis_id": summary.DischargeAdviceId, "discharge_diagnosis": summary.DischargeDiagnosis, "diagnosis_admission_id": summary.DiagnosisAdmissionId, "diagnosis_admission": summary.DiagnosisAdmission, "treatment_id": summary.TreatmentId, "treatment": summary.Treatment, "illness_discharge_id": summary.IllnessDischargeId, "illness_discharge": summary.IllnessDischarge, "discharge_advice_id": summary.DischargeAdviceId, "discharge_advice": summary.DischargeAdvice, "mtime": summary.Mtime, "record_time": summary.RecordTime, "dean_id": summary.DeanId, "doctor": summary.Doctor, "record_date": summary.RecordDate}).Error
+	return err
+}
+
+func DeleteHospitalSummary(id int64) error {
+	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/stock_service.go

@@ -320,7 +320,7 @@ func FindGoodInfoById(id int64) (*models.GoodInfo, error) {
 }
 
 func FindAllGoodType(org_id int64) (goodType []*models.GoodsType, err error) {
-	err = readDb2.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
+	err = XTReadDB().Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
 	return goodType, err
 }
 
@@ -330,7 +330,7 @@ func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error)
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = readDb2.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1", org_id).Find(&goodInfo).Error
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -1557,6 +1557,18 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+func GetManufactureById(id int64) (models.Manufacturer, error) {
+	manufacturer := models.Manufacturer{}
+	err := XTReadDB().Model(&manufacturer).Where("id = ? and status = 1", id).Find(&manufacturer).Error
+	return manufacturer, err
+}
+
+func GetDealerById(id int64) (models.Dealer, error) {
+	dealer := models.Dealer{}
+	err := XTReadDB().Model(&dealer).Where("id=? and status = 1", id).Find(&dealer).Error
+	return dealer, err
+}
+
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -1689,7 +1701,7 @@ func FindAllStockOutList(orgId int64, page int64, limit int64, startTime int64,
 
 func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, startime int64, endtime int64, type_name int64) (list []*models.StockInfo, total int64, err error) {
 
-	db := readDb2.Model(&models.StockInfo{})
+	db := XTReadDB().Model(&models.StockInfo{})
 	if startime > 0 {
 
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
@@ -2952,7 +2964,7 @@ func UpdateGoodsInformation(info *models.GoodInfo, goodName string, goodType int
 
 func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
 
-	db := readDb2.Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
 	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
 	return houseOutInfo, err
 }
@@ -2960,10 +2972,10 @@ func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutI
 func GetGoodInfomationList(orgid int64, keyword string) (goodInfo []*models.GoodInfo, err error) {
 	key := "%" + keyword + "%"
 	if len(keyword) == 0 {
-		err = readDb2.Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodInfo).Error
+		err = XTReadDB().Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodInfo).Error
 
 	} else {
-		err = readDb2.Where("org_id = ? and status = 1 AND good_name like ? AND  find_in_set('停用',good_status) = 0", orgid, key).Find(&goodInfo).Error
+		err = XTReadDB().Where("org_id = ? and status = 1 AND good_name like ? AND  find_in_set('停用',good_status) = 0", orgid, key).Find(&goodInfo).Error
 
 	}
 	return goodInfo, err
@@ -3044,7 +3056,7 @@ func EditDrugWarehousingOne(warehouse models.DrugWarehouse, id int64) {
 
 func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error) {
 
-	err = readDb2.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 
@@ -3344,7 +3356,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 func GetAllGoodInfoStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.GoodInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := readDb2.Table("xt_good_information as x").Where("x.status= 1")
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status= 1")
 
 	likeKey := "%" + keyword + "%"
 	if len(likeKey) > 0 {
@@ -3431,7 +3443,7 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 
 func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
 
-	db := readDb2.Table("xt_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
 	}
@@ -3447,7 +3459,7 @@ func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*mode
 }
 
 func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
-	db := readDb2.Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
 	}
@@ -3465,7 +3477,7 @@ func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*
 func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	if endtime > 0 {
-		err = readDb2.Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
 	}
 	if endtime == 0 {
 		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
@@ -3579,8 +3591,8 @@ func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime i
 
 func GetDrugWarehouOrderInfo(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
 
-	db := readDb2.Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
-	table := readDb2.Table("xt_base_drug as t").Where("t.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.ctime>=?", startime)
@@ -3877,7 +3889,7 @@ func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.Ca
 
 func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
 
-	db := readDb2.Table("xt_cancel_stock_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -3976,7 +3988,7 @@ func GetStockFlowBatchNumberOne(id int64, goodid int64) (stock []*models.VmStock
 	}
 
 	err = db.Select("x.id,x.warehousing_id,x.good_id,x.number,x.count,x.patient_id,x.system_time,x.is_sys,x.warehousing_order,x.warehouse_out_id,x.warehouse_out_order_number,x.price,x.product_date,x.expire_date,x.ctime,o.packing_unit,t.name").Joins("left join xt_patients as t on t.id = x.patient_id").Joins("left join xt_good_information as o on o.id = x.good_id").Scan(&stock).Error
-	//err = XTReadDB().Model(&stock).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Find(&stock).Error
+	//err =XTReadDB()()()()().Model(&stock).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Find(&stock).Error
 	return stock, err
 }
 
@@ -4023,7 +4035,6 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 }
 
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
-func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
 	err := XTReadDB().Where("good_id = ? and warehouse_info_id= ? and status =1", goodid, warehouse_info_id).Last(&info).Error
@@ -4793,7 +4804,7 @@ func GetInventoryDetailById(id []string) (list []*models.XtStockInventory, err e
 func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
 
 	info := models.WarehousingInfo{}
-	//err := XTReadDB().Model(&info).Where("id = ? or warehouse_info_id and status = 1", id).Find(&info).Error
+	//err :=XTReadDB().Model(&info).Where("id = ? or warehouse_info_id and status = 1", id).Find(&info).Error
 	//return info, err
 
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
@@ -4928,7 +4939,7 @@ func CeateStockCorrectRecord(record models.XtStockCorrectRecord) error {
 
 func GetWarehouseTotal(id int64) (models.WarehousingInfo, error) {
 	info := models.WarehousingInfo{}
-	//err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	//err :=XTReadDB()()()()().Where("id=? and status = 1", id).Find(&info).Error
 	//return info, err
 
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
@@ -5089,3 +5100,9 @@ func UpdateDrugWarehouseingInfoSix(id int64, info models.XtDrugWarehouseInfo) er
 	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit}).Error
 	return err
 }
+
+func CreatedCancelStock(info models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}

service/user_service.go

@@ -139,7 +139,7 @@ func GetLastData(orgid int64) (models.SgjPatientDryweight, error) {
 
 func UpdateDialysisPrescription(patientid int64, orgid int64, dryweight float64, prescription models.PredialysisEvaluation) error {
 
-	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ?", patientid, orgid).Update(map[string]interface{}{"dry_weight": dryweight, "mtime": time.Now().Unix()}).Last(&prescription).Error
+	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ? and assessment_date = ?", patientid, orgid, prescription.AssessmentDate).Update(map[string]interface{}{"dry_weight": prescription.DryWeight, "mtime": time.Now().Unix()}).Error
 	fmt.Println("错误是设么", err)
 	return err
 }

service/warhouse_service.go

@@ -235,6 +235,9 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		//}
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
 		fmt.Println("maxNumber0000000000000", maxNumber)
 		fmt.Println("minNumber999999999999999", minNumber)
 		if warehouse.StockMaxNumber < maxNumber {
@@ -498,6 +501,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+	fmt.Println("warehouse233223232323", warehouse.ID)
 	//查找药品信息
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 	if err != nil {
@@ -603,13 +607,18 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		var minNumber int64 = 0
 		fmt.Println("单位1111111", advice.PrescribingNumberUnit)
 		fmt.Println("单位232323233223", drup.MinUnit)
-
+		fmt.Println("出库数量", deliver_number)
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+		fmt.Println("剩余库存233233232323323232")
 
-		if warehouse.StockMaxNumber < maxNumber {
-
-			return errors.New("库存数量不足")
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber {
+				return errors.New("库存数量不足")
+			}
 		}
 
 		fmt.Println("库存数量2332232323", stock_number)
@@ -617,20 +626,30 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		fmt.Println("c出库数量", minNumber)
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
 		fmt.Println("剩余库存", warehouse.StockMaxNumber)
+
+		fmt.Println("ha1", warehouse.StockMinNumber)
+		fmt.Println("ha2", minNumber)
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
+
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+
 		}
 
-		if warehouse.StockMaxNumber < 0 {
-			return errors.New("库存数量不足")
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 {
+				return errors.New("库存数量不足")
+			}
 		}
+
 		//扣减库存232332332332
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
@@ -695,15 +714,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			return errOne
 		}
 		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//	errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//	if errOne != nil {
-		//		return errOne
-		//	}
-		//} else if errcodes == nil {
-		//	UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
+
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -1710,14 +1721,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		fmt.Println("几年里2323323232323232323232")
 		if errThree != nil {
 			return errThree
-		if warehouse.StockCount <= 0 {
-			return errors.New("库存数量不足")
-		} else {
-			//扣减库存
-			errThree := UpDateWarehouseInfoByStock(&warehouse)
-			if errThree != nil {
-				return errThree
-			}
 		}
 
 	} else {
@@ -2069,7 +2072,9 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		//将拆零数量转为 最大包装单位  和 最小单位
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
 		fmt.Println("maxNumber0000000000000", maxNumber)
 		fmt.Println("minNumber999999999999999", minNumber)
 		if warehouse.StockMaxNumber < maxNumber {
@@ -2376,9 +2381,10 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		//把拆零单位转为最大单位  和 最小单位
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
 		if warehouse.StockMaxNumber < maxNumber {
-
 			return errors.New("库存数量不足")
 		}
 
@@ -2397,7 +2403,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		fmt.Println("我爱你233232323232323332323232232332322323233232232323")
+		fmt.Println("我你233232323232323332323232232332322323233232232323")
 		if errThree != nil {
 			return errThree
 		}