11月9日库存管理

conf/app.conf

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

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -48,7 +48,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	//获取透析处方
 	blood_prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 	//获取上机
-	blood_dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+	blood_dialysisOrders, _ := service.GetAllDialysisOrdersByListSeven(orgID, date.Unix())
 
 	for key, schedule := range scheduals {
 		for _, patient := range blood_patients {
@@ -111,7 +111,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 
 		//获取上机
-		dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+		dialysisOrders, _ := service.GetAllDialysisOrdersByListSeven(orgID, date.Unix())
 
 		for key, item := range project {
 			for _, patient := range patients {

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -714,7 +714,6 @@ func (c *StaffScheduleApiController) GetSolutionSchedule() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
-	fmt.Println("时间错2332233323223", theTime.Unix())
 	schedule, _ := service.GetSolutionScheduleBySchedule(orgId, zoneid, classtype, theTime.Unix())
 	c.ServeSuccessJSON(map[string]interface{}{
 		"schedule": schedule,

service/patient_service.go

@@ -1378,7 +1378,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		Preload("TreatmentSummary", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("Device", "org_id=? and status=1", orgID).
 		Preload("UserAdminRole", func(db *gorm.DB) *gorm.DB {
-			return readUserDb.Where("org_id=? and status = 1", orgID)
+			return readUserDb.Where("org_id=?", orgID)
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
@@ -2267,13 +2267,12 @@ func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrd
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-	//fmt.Println("hhhahdfhadhfhahfhahfh",scheduleDate)
-	//fmt.Println("hhhahdfhadhfhahfhahfh",key)
-	//if (scheduleDate==1669132800){
-	//  redis.Set(key, "", time.Second)
-	//}
-	//
-	//fmt.Println("hhhahdfhadhfhahfhahfh",dialysis_orders_list_all)
+
+	if scheduleDate < 1669132800 {
+		fmt.Println("key233232232332323232", key)
+		redis.Set(key, "", time.Second)
+	}
+	fmt.Println("dialysis_orders_list_all", dialysis_orders_list_all)
 	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 {
@@ -2328,6 +2327,12 @@ func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
 	}
 }
 
+func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+
+	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
+	return dialysisOrders, err
+}
+
 func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
 
 	redis := RedisClient()