11月8日库存管理

controllers/dialysis_record_api_controller.go

 					redis.Set(key, scheduals_json, time.Second*60)
 				}
 			}
+			information, _ := service.GetAdminUserRoleInformation(orgID)
 
 			this.ServeSuccessJSON(map[string]interface{}{
-				"schedules": scheduals,
+				"schedules":   scheduals,
+				"information": information,
 			})
 
 		}
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
 
+	information, _ := service.GetAdminUserRoleInformation(adminInfo.CurrentOrgId)
 	returnData := map[string]interface{}{
 		"patient":                     patient,
 		"schedual":                    schedual,
 		"stockType":                   stockType,
 		"prepare":                     prepare,
 		"lastAssessment":              lastAssessment,
+		"information":                 information,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/mobile_api_controllers/dialysis_api_controller.go

 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
 
 	scheduals_json_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
 
 				}
 			}
 
+			//获取今日所有的处方开的耗材
+			project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
+
+			//获取今日透析准备的数据
+			goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
+
+			list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
+
+			for _, item := range goodList {
+				for _, it := range list {
+					if item.RecordDate == it.RecordDate && it.PatientId == it.PatientId {
+						item.Children = append(item.Children, it)
+					}
+				}
+			}
+
+			fmt.Println("goodlist888888888888888888888", goodList, err)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
+				"project":   project,
+				"goodList":  goodList,
 			})
 		}
 
 		} else {
 
 		}
+		//获取今日所有的处方开的耗材
+		project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
+
+		//获取今日透析准备的数据
+		goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
+		fmt.Println("goodlist23323232323233232332233223323233", goodList, err)
+
+		list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
 
+		for _, item := range goodList {
+			for _, it := range list {
+				if item.RecordDate == it.RecordDate && it.PatientId == it.PatientId {
+					item.Children = append(item.Children, it)
+				}
+			}
+		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
+			"project":   project,
+			"goodList":  goodList,
 		})
 
 	}
 		// 先走redis，没有走数据库
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
-
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 	loc, _ := time.LoadLocation("Local")
 
 	startTime := this.GetString("start_time")
-	fmt.Println("开始烧豆腐阿方阿方阿方", startTime)
 
 	endTime := this.GetString("end_time")
 	startTimeUnix, _ := time.ParseInLocation(timeLayout+" 15:04:05", startTime+" 00:00:00", loc)
 
 	patient_id, _ := this.GetInt64("patient_id")
 
-	fmt.Println("hhhhhhhhhhhhhhhkaishi", startTimeUnix.Unix())
 	list, total, err := service.GetTreateSummary(startTimeUnix.Unix(), endTimeUnix.Unix(), limit, page, creater, patient_id)
 
 	//var inspectionTemplate []*models.VmInspection
 			item.Children = append(item.Children, it)
 		}
 	}
-	fmt.Println("hhhhhhhhhhhhh99999999999999", list)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

service/dialysis_service.go

 	err = readDb.Model(&models.HisPrescriptionProject{}).Joins("JOIN xt_his_project as p On p.id = his_prescription_project.project_id AND p.cost_classify = 3").Where("his_prescription_project.team_id IN (?) AND his_prescription_project.patient_id = ? AND his_prescription_project.user_org_id = ? AND his_prescription_project.record_date = ? AND his_prescription_project.status = 1", team_id, patient_id, user_org_id, record_date).Find(&ps).Error
 	return
 }
+
+func GetAdminUserRoleInformation(orgid int64) (models.SgjOrgFollow, error) {
+
+	follow := models.SgjOrgFollow{}
+
+	db := UserReadDB().Table("sgj_org_follow as f").Where("f.status = 1")
+	table := UserReadDB().Table("sgj_admin as a").Where("a.status = 1")
+	fmt.Println(table)
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+
+	err := db.Select("f.org_id,f.admin_user_id,a.name,a.phone,a.camera,a.wechat,a.qqchat,a.email").Joins("left join sgj_admin as a on a.id = f.admin_user_id").Scan(&follow).Error
+	return follow, err
+}