|
@@ -222,12 +222,18 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
|
222
|
222
|
if err == nil {
|
223
|
223
|
redis.Set(key, assessment_befores_list_all, time.Second*60*60*18)
|
224
|
224
|
}
|
|
225
|
+ } else {
|
|
226
|
+ redis.Set(key, "null", time.Second*60*60*18)
|
225
|
227
|
}
|
226
|
228
|
return assessmentBefores, nil
|
227
|
229
|
}
|
228
|
230
|
} else { //缓存数据了数据,将redis缓存的json字符串转为map
|
229
|
|
- json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
|
230
|
|
- return assessmentBefores, nil
|
|
231
|
+ if assessment_befores_list_all == "null" {
|
|
232
|
+ return nil,nil
|
|
233
|
+ } else {
|
|
234
|
+ json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
|
|
235
|
+ return assessmentBefores, nil
|
|
236
|
+ }
|
231
|
237
|
}
|
232
|
238
|
}
|
233
|
239
|
|
|
@@ -283,12 +289,18 @@ func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSu
|
283
|
289
|
if err == nil {
|
284
|
290
|
redis.Set(key, treatment_summarys_all, time.Second*60*60*18)
|
285
|
291
|
}
|
|
292
|
+ } else {
|
|
293
|
+ redis.Set(key, "null", time.Second*60*60*18)
|
286
|
294
|
}
|
287
|
295
|
return treatmentSummarys, nil
|
288
|
296
|
}
|
289
|
297
|
} else { //缓存数据了数据,将redis缓存的json字符串转为map
|
290
|
|
- json.Unmarshal([]byte(treatment_summarys_all), &treatmentSummarys)
|
291
|
|
- return treatmentSummarys, nil
|
|
298
|
+ if treatment_summarys_all == "null" {
|
|
299
|
+ return nil,nil
|
|
300
|
+ } else {
|
|
301
|
+ json.Unmarshal([]byte(treatment_summarys_all), &treatmentSummarys)
|
|
302
|
+ return treatmentSummarys, nil
|
|
303
|
+ }
|
292
|
304
|
}
|
293
|
305
|
}
|
294
|
306
|
|