|
@@ -79,22 +79,42 @@ func (this *FunctionBaseAPIController) GetYestodayInfo() {
|
79
|
79
|
}
|
80
|
80
|
range_data := this.GetString("range_data")
|
81
|
81
|
fmt.Println("昨日日期",range_data)
|
|
82
|
+ starttime := this.GetString("starttime")
|
|
83
|
+ fmt.Println("昨日开始时间",starttime)
|
|
84
|
+ endtime := this.GetString("endtime")
|
|
85
|
+ fmt.Println("昨日结束时间",endtime)
|
82
|
86
|
var rangeDate *time.Time
|
83
|
87
|
var parseDateErr error
|
84
|
|
- var rangeTimeStamp int64
|
|
88
|
+ var startrangeTimeStamp int64
|
|
89
|
+ var endrangeTimeStamp int64
|
85
|
90
|
|
86
|
|
- if len(range_data) > 0 {
|
87
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
91
|
+ if len(starttime) > 0 {
|
|
92
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
93
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
94
|
+ fmt.Println("parseDateErr",parseDateErr)
|
88
|
95
|
if parseDateErr != nil {
|
89
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
96
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
90
|
97
|
return
|
91
|
98
|
}
|
92
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
99
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
100
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
93
|
101
|
} else {
|
94
|
|
- rangeTimeStamp = 0
|
|
102
|
+ startrangeTimeStamp = 0
|
95
|
103
|
}
|
96
|
|
- now := time.Now().Unix()
|
97
|
|
- patients, total, err := service.GetTodayInfo(rangeTimeStamp, now,page,limit)
|
|
104
|
+ if len(endtime) > 0 {
|
|
105
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
106
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
107
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
108
|
+ if parseDateErr != nil {
|
|
109
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
110
|
+ return
|
|
111
|
+ }
|
|
112
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
113
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
114
|
+ } else {
|
|
115
|
+ endrangeTimeStamp = 0
|
|
116
|
+ }
|
|
117
|
+ patients, total, err := service.GetTodayInfo(startrangeTimeStamp, endrangeTimeStamp,page,limit)
|
98
|
118
|
fmt.Println("total",total)
|
99
|
119
|
fmt.Println("patients是什么",patients)
|
100
|
120
|
fmt.Println("查询错误是什么",err)
|
|
@@ -383,23 +403,43 @@ func (this *FunctionBaseAPIController) GetYesterTodayDialysisInfo() {
|
383
|
403
|
if limit <= 0 {
|
384
|
404
|
limit = 10
|
385
|
405
|
}
|
386
|
|
-
|
|
406
|
+ starttime := this.GetString("starttime")
|
|
407
|
+ fmt.Println("昨日开始时间",starttime)
|
|
408
|
+ endtime := this.GetString("endtime")
|
|
409
|
+ fmt.Println("昨日结束时间",endtime)
|
387
|
410
|
var rangeDate *time.Time
|
388
|
411
|
var parseDateErr error
|
389
|
|
- var rangeTimeStamp int64
|
|
412
|
+ var startrangeTimeStamp int64
|
|
413
|
+ var endrangeTimeStamp int64
|
390
|
414
|
|
391
|
|
- if len(range_data) > 0 {
|
392
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
415
|
+ if len(starttime) > 0 {
|
|
416
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
417
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
418
|
+ fmt.Println("parseDateErr",parseDateErr)
|
393
|
419
|
if parseDateErr != nil {
|
394
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
420
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
395
|
421
|
return
|
396
|
422
|
}
|
397
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
423
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
424
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
398
|
425
|
} else {
|
399
|
|
- rangeTimeStamp = 0
|
|
426
|
+ startrangeTimeStamp = 0
|
400
|
427
|
}
|
401
|
|
- now := time.Now().Unix()
|
402
|
|
- dialysis, total, err := service.GetTodayDialysisPatientsInfo(rangeTimeStamp, now, page, limit)
|
|
428
|
+ if len(endtime) > 0 {
|
|
429
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
430
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
431
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
432
|
+ if parseDateErr != nil {
|
|
433
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
434
|
+ return
|
|
435
|
+ }
|
|
436
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
437
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
438
|
+ } else {
|
|
439
|
+ endrangeTimeStamp = 0
|
|
440
|
+ }
|
|
441
|
+
|
|
442
|
+ dialysis, total, err := service.GetTodayDialysisPatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
403
|
443
|
fmt.Println("dialysis",dialysis)
|
404
|
444
|
fmt.Println("total",total)
|
405
|
445
|
fmt.Println("报错",err)
|
|
@@ -668,7 +708,7 @@ func (this *FunctionBaseAPIController) GetReceiveinfo() {
|
668
|
708
|
|
669
|
709
|
func (this *FunctionBaseAPIController) GetYesTodayReceiveinfo() {
|
670
|
710
|
range_data := this.GetString("range_data")
|
671
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
711
|
+ fmt.Println("昨日接诊评估",range_data)
|
672
|
712
|
page, _ := this.GetInt64("page", 1)
|
673
|
713
|
fmt.Println("页面",page)
|
674
|
714
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -679,22 +719,42 @@ func (this *FunctionBaseAPIController) GetYesTodayReceiveinfo() {
|
679
|
719
|
if limit <= 0 {
|
680
|
720
|
limit = 10
|
681
|
721
|
}
|
|
722
|
+ starttime := this.GetString("starttime")
|
|
723
|
+ fmt.Println("昨日开始时间",starttime)
|
|
724
|
+ endtime := this.GetString("endtime")
|
|
725
|
+ fmt.Println("昨日结束时间",endtime)
|
682
|
726
|
var rangeDate *time.Time
|
683
|
727
|
var parseDateErr error
|
684
|
|
- var rangeTimeStamp int64
|
|
728
|
+ var startrangeTimeStamp int64
|
|
729
|
+ var endrangeTimeStamp int64
|
685
|
730
|
|
686
|
|
- if len(range_data) > 0 {
|
687
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
731
|
+ if len(starttime) > 0 {
|
|
732
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
733
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
734
|
+ fmt.Println("parseDateErr",parseDateErr)
|
688
|
735
|
if parseDateErr != nil {
|
689
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
736
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
690
|
737
|
return
|
691
|
738
|
}
|
692
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
739
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
740
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
693
|
741
|
} else {
|
694
|
|
- rangeTimeStamp = 0
|
|
742
|
+ startrangeTimeStamp = 0
|
695
|
743
|
}
|
696
|
|
- now := time.Now().Unix()
|
697
|
|
- receive, total, err := service.GetTodayReceivePatientsInfo(rangeTimeStamp, now, page, limit)
|
|
744
|
+ if len(endtime) > 0 {
|
|
745
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
746
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
747
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
748
|
+ if parseDateErr != nil {
|
|
749
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
750
|
+ return
|
|
751
|
+ }
|
|
752
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
753
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
754
|
+ } else {
|
|
755
|
+ endrangeTimeStamp = 0
|
|
756
|
+ }
|
|
757
|
+ receive, total, err := service.GetTodayReceivePatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
698
|
758
|
fmt.Println("patients",receive)
|
699
|
759
|
fmt.Println("total",total)
|
700
|
760
|
fmt.Println("错误",err)
|
|
@@ -963,7 +1023,7 @@ func (this *FunctionBaseAPIController) GetTodayBeforDislysisInfo() {
|
963
|
1023
|
|
964
|
1024
|
func (this *FunctionBaseAPIController) GetYesterTodayBeforDislysisInfo() {
|
965
|
1025
|
range_data := this.GetString("range_data")
|
966
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
1026
|
+ fmt.Println("昨日透前评估日期",range_data)
|
967
|
1027
|
page, _ := this.GetInt64("page", 1)
|
968
|
1028
|
fmt.Println("页面",page)
|
969
|
1029
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -974,22 +1034,42 @@ func (this *FunctionBaseAPIController) GetYesterTodayBeforDislysisInfo() {
|
974
|
1034
|
if limit <= 0 {
|
975
|
1035
|
limit = 10
|
976
|
1036
|
}
|
|
1037
|
+ starttime := this.GetString("starttime")
|
|
1038
|
+ fmt.Println("昨日开始时间",starttime)
|
|
1039
|
+ endtime := this.GetString("endtime")
|
|
1040
|
+ fmt.Println("昨日结束时间",endtime)
|
977
|
1041
|
var rangeDate *time.Time
|
978
|
1042
|
var parseDateErr error
|
979
|
|
- var rangeTimeStamp int64
|
|
1043
|
+ var startrangeTimeStamp int64
|
|
1044
|
+ var endrangeTimeStamp int64
|
980
|
1045
|
|
981
|
|
- if len(range_data) > 0 {
|
982
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
1046
|
+ if len(starttime) > 0 {
|
|
1047
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
1048
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1049
|
+ fmt.Println("parseDateErr",parseDateErr)
|
983
|
1050
|
if parseDateErr != nil {
|
984
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
1051
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
985
|
1052
|
return
|
986
|
1053
|
}
|
987
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
1054
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
1055
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
988
|
1056
|
} else {
|
989
|
|
- rangeTimeStamp = 0
|
|
1057
|
+ startrangeTimeStamp = 0
|
990
|
1058
|
}
|
991
|
|
- now := time.Now().Unix()
|
992
|
|
- receive, total, err := service.GetTodayReceivePatientsInfo(rangeTimeStamp, now, page, limit)
|
|
1059
|
+ if len(endtime) > 0 {
|
|
1060
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
1061
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1062
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
1063
|
+ if parseDateErr != nil {
|
|
1064
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
1065
|
+ return
|
|
1066
|
+ }
|
|
1067
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
1068
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
1069
|
+ } else {
|
|
1070
|
+ endrangeTimeStamp = 0
|
|
1071
|
+ }
|
|
1072
|
+ receive, total, err := service.GetTodayReceivePatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
993
|
1073
|
fmt.Println("patients",receive)
|
994
|
1074
|
fmt.Println("total",total)
|
995
|
1075
|
fmt.Println("错误",err)
|
|
@@ -1257,7 +1337,7 @@ func (this *FunctionBaseAPIController) GetTodayDoctorsOrderInfo() {
|
1257
|
1337
|
|
1258
|
1338
|
func (this *FunctionBaseAPIController) GetYesterDayDoctorsOrderInfo() {
|
1259
|
1339
|
range_data := this.GetString("range_data")
|
1260
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
1340
|
+ fmt.Println("昨日零时意识",range_data)
|
1261
|
1341
|
page, _ := this.GetInt64("page", 1)
|
1262
|
1342
|
fmt.Println("页面",page)
|
1263
|
1343
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -1268,22 +1348,42 @@ func (this *FunctionBaseAPIController) GetYesterDayDoctorsOrderInfo() {
|
1268
|
1348
|
if limit <= 0 {
|
1269
|
1349
|
limit = 10
|
1270
|
1350
|
}
|
|
1351
|
+ starttime := this.GetString("starttime")
|
|
1352
|
+ fmt.Println("昨日开始时间",starttime)
|
|
1353
|
+ endtime := this.GetString("endtime")
|
|
1354
|
+ fmt.Println("昨日结束时间",endtime)
|
1271
|
1355
|
var rangeDate *time.Time
|
1272
|
1356
|
var parseDateErr error
|
1273
|
|
- var rangeTimeStamp int64
|
|
1357
|
+ var startrangeTimeStamp int64
|
|
1358
|
+ var endrangeTimeStamp int64
|
1274
|
1359
|
|
1275
|
|
- if len(range_data) > 0 {
|
1276
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
1360
|
+ if len(starttime) > 0 {
|
|
1361
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
1362
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1363
|
+ fmt.Println("parseDateErr",parseDateErr)
|
1277
|
1364
|
if parseDateErr != nil {
|
1278
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
1365
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
1279
|
1366
|
return
|
1280
|
1367
|
}
|
1281
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
1368
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
1369
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
1282
|
1370
|
} else {
|
1283
|
|
- rangeTimeStamp = 0
|
|
1371
|
+ startrangeTimeStamp = 0
|
1284
|
1372
|
}
|
1285
|
|
- now := time.Now().Unix()
|
1286
|
|
- receive, total, err := service.GetTodayDoctorsOrderInfo(rangeTimeStamp, now, page, limit)
|
|
1373
|
+ if len(endtime) > 0 {
|
|
1374
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
1375
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1376
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
1377
|
+ if parseDateErr != nil {
|
|
1378
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
1379
|
+ return
|
|
1380
|
+ }
|
|
1381
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
1382
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
1383
|
+ } else {
|
|
1384
|
+ endrangeTimeStamp = 0
|
|
1385
|
+ }
|
|
1386
|
+ receive, total, err := service.GetTodayDoctorsOrderInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
1287
|
1387
|
fmt.Println("patients",receive)
|
1288
|
1388
|
fmt.Println("total",total)
|
1289
|
1389
|
fmt.Println("错误",err)
|
|
@@ -1551,7 +1651,7 @@ func (this *FunctionBaseAPIController) GetTodayDoubleCheckInfo() {
|
1551
|
1651
|
|
1552
|
1652
|
func (this *FunctionBaseAPIController) GetYesTodayDoubleCheckInfo() {
|
1553
|
1653
|
range_data := this.GetString("range_data")
|
1554
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
1654
|
+ fmt.Println("昨日双人核对",range_data)
|
1555
|
1655
|
page, _ := this.GetInt64("page", 1)
|
1556
|
1656
|
fmt.Println("页面",page)
|
1557
|
1657
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -1562,22 +1662,42 @@ func (this *FunctionBaseAPIController) GetYesTodayDoubleCheckInfo() {
|
1562
|
1662
|
if limit <= 0 {
|
1563
|
1663
|
limit = 10
|
1564
|
1664
|
}
|
|
1665
|
+ starttime := this.GetString("starttime")
|
|
1666
|
+ fmt.Println("昨日开始时间",starttime)
|
|
1667
|
+ endtime := this.GetString("endtime")
|
|
1668
|
+ fmt.Println("昨日结束时间",endtime)
|
1565
|
1669
|
var rangeDate *time.Time
|
1566
|
1670
|
var parseDateErr error
|
1567
|
|
- var rangeTimeStamp int64
|
|
1671
|
+ var startrangeTimeStamp int64
|
|
1672
|
+ var endrangeTimeStamp int64
|
1568
|
1673
|
|
1569
|
|
- if len(range_data) > 0 {
|
1570
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
1674
|
+ if len(starttime) > 0 {
|
|
1675
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
1676
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1677
|
+ fmt.Println("parseDateErr",parseDateErr)
|
1571
|
1678
|
if parseDateErr != nil {
|
1572
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
1679
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
1573
|
1680
|
return
|
1574
|
1681
|
}
|
1575
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
1682
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
1683
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
1576
|
1684
|
} else {
|
1577
|
|
- rangeTimeStamp = 0
|
|
1685
|
+ startrangeTimeStamp = 0
|
1578
|
1686
|
}
|
1579
|
|
- now := time.Now().Unix()
|
1580
|
|
- receive, total, err := service.GetTodayDoubleCheckInfo(rangeTimeStamp, now, page, limit)
|
|
1687
|
+ if len(endtime) > 0 {
|
|
1688
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
1689
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1690
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
1691
|
+ if parseDateErr != nil {
|
|
1692
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
1693
|
+ return
|
|
1694
|
+ }
|
|
1695
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
1696
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
1697
|
+ } else {
|
|
1698
|
+ endrangeTimeStamp = 0
|
|
1699
|
+ }
|
|
1700
|
+ receive, total, err := service.GetTodayDoubleCheckInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
1581
|
1701
|
fmt.Println("patients",receive)
|
1582
|
1702
|
fmt.Println("total",total)
|
1583
|
1703
|
fmt.Println("错误",err)
|
|
@@ -1845,7 +1965,7 @@ func (this *FunctionBaseAPIController) GetTodayDialysisMachinek() {
|
1845
|
1965
|
|
1846
|
1966
|
func (this *FunctionBaseAPIController) GetYesterTodayDialysisMachinek() {
|
1847
|
1967
|
range_data := this.GetString("range_data")
|
1848
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
1968
|
+ fmt.Println("昨日透析上机",range_data)
|
1849
|
1969
|
page, _ := this.GetInt64("page", 1)
|
1850
|
1970
|
fmt.Println("页面",page)
|
1851
|
1971
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -1856,22 +1976,42 @@ func (this *FunctionBaseAPIController) GetYesterTodayDialysisMachinek() {
|
1856
|
1976
|
if limit <= 0 {
|
1857
|
1977
|
limit = 10
|
1858
|
1978
|
}
|
|
1979
|
+ starttime := this.GetString("starttime")
|
|
1980
|
+ fmt.Println("昨日开始时间",starttime)
|
|
1981
|
+ endtime := this.GetString("endtime")
|
|
1982
|
+ fmt.Println("昨日结束时间",endtime)
|
1859
|
1983
|
var rangeDate *time.Time
|
1860
|
1984
|
var parseDateErr error
|
1861
|
|
- var rangeTimeStamp int64
|
|
1985
|
+ var startrangeTimeStamp int64
|
|
1986
|
+ var endrangeTimeStamp int64
|
1862
|
1987
|
|
1863
|
|
- if len(range_data) > 0 {
|
1864
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
1988
|
+ if len(starttime) > 0 {
|
|
1989
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
1990
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
1991
|
+ fmt.Println("parseDateErr",parseDateErr)
|
1865
|
1992
|
if parseDateErr != nil {
|
1866
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
1993
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
1867
|
1994
|
return
|
1868
|
1995
|
}
|
1869
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
1996
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
1997
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
1870
|
1998
|
} else {
|
1871
|
|
- rangeTimeStamp = 0
|
|
1999
|
+ startrangeTimeStamp = 0
|
1872
|
2000
|
}
|
1873
|
|
- now := time.Now().Unix()
|
1874
|
|
- patients, total, err := service.GetTodayDialysisMachinek(rangeTimeStamp, now, page, limit)
|
|
2001
|
+ if len(endtime) > 0 {
|
|
2002
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
2003
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2004
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
2005
|
+ if parseDateErr != nil {
|
|
2006
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
2007
|
+ return
|
|
2008
|
+ }
|
|
2009
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
2010
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
2011
|
+ } else {
|
|
2012
|
+ endrangeTimeStamp = 0
|
|
2013
|
+ }
|
|
2014
|
+ patients, total, err := service.GetTodayDialysisMachinek(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
1875
|
2015
|
fmt.Println("patients",patients)
|
1876
|
2016
|
fmt.Println("total",total)
|
1877
|
2017
|
fmt.Println("错误",err)
|
|
@@ -2139,7 +2279,7 @@ func (this *FunctionBaseAPIController) GetTodayDialysisExamination() {
|
2139
|
2279
|
|
2140
|
2280
|
func (this *FunctionBaseAPIController) GetYesTodayDialysisExamination() {
|
2141
|
2281
|
range_data := this.GetString("range_data")
|
2142
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
2282
|
+ fmt.Println("昨日透析检测",range_data)
|
2143
|
2283
|
page, _ := this.GetInt64("page", 1)
|
2144
|
2284
|
fmt.Println("页面",page)
|
2145
|
2285
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -2150,22 +2290,42 @@ func (this *FunctionBaseAPIController) GetYesTodayDialysisExamination() {
|
2150
|
2290
|
if limit <= 0 {
|
2151
|
2291
|
limit = 10
|
2152
|
2292
|
}
|
|
2293
|
+ starttime := this.GetString("starttime")
|
|
2294
|
+ fmt.Println("昨日开始时间",starttime)
|
|
2295
|
+ endtime := this.GetString("endtime")
|
|
2296
|
+ fmt.Println("昨日结束时间",endtime)
|
2153
|
2297
|
var rangeDate *time.Time
|
2154
|
2298
|
var parseDateErr error
|
2155
|
|
- var rangeTimeStamp int64
|
|
2299
|
+ var startrangeTimeStamp int64
|
|
2300
|
+ var endrangeTimeStamp int64
|
2156
|
2301
|
|
2157
|
|
- if len(range_data) > 0 {
|
2158
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
2302
|
+ if len(starttime) > 0 {
|
|
2303
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
2304
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2305
|
+ fmt.Println("parseDateErr",parseDateErr)
|
2159
|
2306
|
if parseDateErr != nil {
|
2160
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
2307
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
2161
|
2308
|
return
|
2162
|
2309
|
}
|
2163
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
2310
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
2311
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
2164
|
2312
|
} else {
|
2165
|
|
- rangeTimeStamp = 0
|
|
2313
|
+ startrangeTimeStamp = 0
|
2166
|
2314
|
}
|
2167
|
|
- now := time.Now().Unix()
|
2168
|
|
- patients, total, err := service.GetTodayDialysisExamination(rangeTimeStamp, now, page, limit)
|
|
2315
|
+ if len(endtime) > 0 {
|
|
2316
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
2317
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2318
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
2319
|
+ if parseDateErr != nil {
|
|
2320
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
2321
|
+ return
|
|
2322
|
+ }
|
|
2323
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
2324
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
2325
|
+ } else {
|
|
2326
|
+ endrangeTimeStamp = 0
|
|
2327
|
+ }
|
|
2328
|
+ patients, total, err := service.GetTodayDialysisExamination(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
2169
|
2329
|
fmt.Println("patients",patients)
|
2170
|
2330
|
fmt.Println("total",total)
|
2171
|
2331
|
fmt.Println("错误",err)
|
|
@@ -2433,7 +2593,7 @@ func (this *FunctionBaseAPIController) GetTodayBeforOrpenetration() {
|
2433
|
2593
|
|
2434
|
2594
|
func (this *FunctionBaseAPIController) GetYesterDayBeforpinetration() {
|
2435
|
2595
|
range_data := this.GetString("range_data")
|
2436
|
|
- fmt.Println("本月透析处方日期",range_data)
|
|
2596
|
+ fmt.Println("昨日",range_data)
|
2437
|
2597
|
page, _ := this.GetInt64("page", 1)
|
2438
|
2598
|
fmt.Println("页面",page)
|
2439
|
2599
|
limit, _ := this.GetInt64("limit", 10)
|
|
@@ -2444,22 +2604,42 @@ func (this *FunctionBaseAPIController) GetYesterDayBeforpinetration() {
|
2444
|
2604
|
if limit <= 0 {
|
2445
|
2605
|
limit = 10
|
2446
|
2606
|
}
|
|
2607
|
+ starttime := this.GetString("starttime")
|
|
2608
|
+ fmt.Println("昨日开始时间",starttime)
|
|
2609
|
+ endtime := this.GetString("endtime")
|
|
2610
|
+ fmt.Println("昨日结束时间",endtime)
|
2447
|
2611
|
var rangeDate *time.Time
|
2448
|
2612
|
var parseDateErr error
|
2449
|
|
- var rangeTimeStamp int64
|
|
2613
|
+ var startrangeTimeStamp int64
|
|
2614
|
+ var endrangeTimeStamp int64
|
2450
|
2615
|
|
2451
|
|
- if len(range_data) > 0 {
|
2452
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
2616
|
+ if len(starttime) > 0 {
|
|
2617
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
2618
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2619
|
+ fmt.Println("parseDateErr",parseDateErr)
|
2453
|
2620
|
if parseDateErr != nil {
|
2454
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
2621
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
2455
|
2622
|
return
|
2456
|
2623
|
}
|
2457
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
2624
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
2625
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
2458
|
2626
|
} else {
|
2459
|
|
- rangeTimeStamp = 0
|
|
2627
|
+ startrangeTimeStamp = 0
|
2460
|
2628
|
}
|
2461
|
|
- now := time.Now().Unix()
|
2462
|
|
- patients, total, err := service.GetTodayBeforOrpenetration(rangeTimeStamp, now, page, limit)
|
|
2629
|
+ if len(endtime) > 0 {
|
|
2630
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
2631
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2632
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
2633
|
+ if parseDateErr != nil {
|
|
2634
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
2635
|
+ return
|
|
2636
|
+ }
|
|
2637
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
2638
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
2639
|
+ } else {
|
|
2640
|
+ endrangeTimeStamp = 0
|
|
2641
|
+ }
|
|
2642
|
+ patients, total, err := service.GetTodayBeforOrpenetration(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
2463
|
2643
|
fmt.Println("patients",patients)
|
2464
|
2644
|
fmt.Println("total",total)
|
2465
|
2645
|
fmt.Println("错误",err)
|
|
@@ -2738,22 +2918,42 @@ func (this *FunctionBaseAPIController) GetYesterDayPostAssessment() {
|
2738
|
2918
|
if limit <= 0 {
|
2739
|
2919
|
limit = 10
|
2740
|
2920
|
}
|
|
2921
|
+ starttime := this.GetString("starttime")
|
|
2922
|
+ fmt.Println("昨日开始时间",starttime)
|
|
2923
|
+ endtime := this.GetString("endtime")
|
|
2924
|
+ fmt.Println("昨日结束时间",endtime)
|
2741
|
2925
|
var rangeDate *time.Time
|
2742
|
2926
|
var parseDateErr error
|
2743
|
|
- var rangeTimeStamp int64
|
|
2927
|
+ var startrangeTimeStamp int64
|
|
2928
|
+ var endrangeTimeStamp int64
|
2744
|
2929
|
|
2745
|
|
- if len(range_data) > 0 {
|
2746
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
2930
|
+ if len(starttime) > 0 {
|
|
2931
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
2932
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2933
|
+ fmt.Println("parseDateErr",parseDateErr)
|
2747
|
2934
|
if parseDateErr != nil {
|
2748
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
2935
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
2749
|
2936
|
return
|
2750
|
2937
|
}
|
2751
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
2938
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
2939
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
2752
|
2940
|
} else {
|
2753
|
|
- rangeTimeStamp = 0
|
|
2941
|
+ startrangeTimeStamp = 0
|
2754
|
2942
|
}
|
2755
|
|
- now := time.Now().Unix()
|
2756
|
|
- patients, total, err := service.GetTodayPostAssessment(rangeTimeStamp, now, page, limit)
|
|
2943
|
+ if len(endtime) > 0 {
|
|
2944
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
2945
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
2946
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
2947
|
+ if parseDateErr != nil {
|
|
2948
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
2949
|
+ return
|
|
2950
|
+ }
|
|
2951
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
2952
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
2953
|
+ } else {
|
|
2954
|
+ endrangeTimeStamp = 0
|
|
2955
|
+ }
|
|
2956
|
+ patients, total, err := service.GetTodayPostAssessment(startrangeTimeStamp, endrangeTimeStamp, page, limit)
|
2757
|
2957
|
fmt.Println("patients",patients)
|
2758
|
2958
|
fmt.Println("total",total)
|
2759
|
2959
|
fmt.Println("错误",err)
|
|
@@ -3035,22 +3235,42 @@ func (this *FunctionBaseAPIController) GetYesterdayEntrylist() {
|
3035
|
3235
|
if limit <= 0 {
|
3036
|
3236
|
limit = 10
|
3037
|
3237
|
}
|
|
3238
|
+ starttime := this.GetString("starttime")
|
|
3239
|
+ fmt.Println("昨日开始时间",starttime)
|
|
3240
|
+ endtime := this.GetString("endtime")
|
|
3241
|
+ fmt.Println("昨日结束时间",endtime)
|
3038
|
3242
|
var rangeDate *time.Time
|
3039
|
3243
|
var parseDateErr error
|
3040
|
|
- var rangeTimeStamp int64
|
|
3244
|
+ var startrangeTimeStamp int64
|
|
3245
|
+ var endrangeTimeStamp int64
|
3041
|
3246
|
|
3042
|
|
- if len(range_data) > 0 {
|
3043
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
3247
|
+ if len(starttime) > 0 {
|
|
3248
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
3249
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
3250
|
+ fmt.Println("parseDateErr",parseDateErr)
|
3044
|
3251
|
if parseDateErr != nil {
|
3045
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
3252
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
3046
|
3253
|
return
|
3047
|
3254
|
}
|
3048
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
3255
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
3256
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
3049
|
3257
|
} else {
|
3050
|
|
- rangeTimeStamp = 0
|
|
3258
|
+ startrangeTimeStamp = 0
|
3051
|
3259
|
}
|
3052
|
|
- now := time.Now().Unix()
|
3053
|
|
- userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
|
|
3260
|
+ if len(endtime) > 0 {
|
|
3261
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
3262
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
3263
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
3264
|
+ if parseDateErr != nil {
|
|
3265
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
3266
|
+ return
|
|
3267
|
+ }
|
|
3268
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
3269
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
3270
|
+ } else {
|
|
3271
|
+ endrangeTimeStamp = 0
|
|
3272
|
+ }
|
|
3273
|
+ userorg, total, err := service.GetTodayEntrylist(startrangeTimeStamp, endrangeTimeStamp, limit, page)
|
3054
|
3274
|
//3代表血透,2//退出登录状态
|
3055
|
3275
|
//userorgs, err := service.GetTodayLogout(0, 2)
|
3056
|
3276
|
//fmt.Scan("userorgs是什么",userorgs)
|
|
@@ -3344,22 +3564,42 @@ func (this *FunctionBaseAPIController) GetYesterdayExitlist() {
|
3344
|
3564
|
if limit <= 0 {
|
3345
|
3565
|
limit = 10
|
3346
|
3566
|
}
|
|
3567
|
+ starttime := this.GetString("starttime")
|
|
3568
|
+ fmt.Println("昨日开始时间",starttime)
|
|
3569
|
+ endtime := this.GetString("endtime")
|
|
3570
|
+ fmt.Println("昨日结束时间",endtime)
|
3347
|
3571
|
var rangeDate *time.Time
|
3348
|
3572
|
var parseDateErr error
|
3349
|
|
- var rangeTimeStamp int64
|
|
3573
|
+ var startrangeTimeStamp int64
|
|
3574
|
+ var endrangeTimeStamp int64
|
3350
|
3575
|
|
3351
|
|
- if len(range_data) > 0 {
|
3352
|
|
- rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
|
|
3576
|
+ if len(starttime) > 0 {
|
|
3577
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
|
|
3578
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
3579
|
+ fmt.Println("parseDateErr",parseDateErr)
|
3353
|
3580
|
if parseDateErr != nil {
|
3354
|
|
- this.ErrorLog("日期(%v)解析错误:%v", range_data, parseDateErr)
|
|
3581
|
+ this.ErrorLog("日期(%v)解析错误:%v", starttime, parseDateErr)
|
3355
|
3582
|
return
|
3356
|
3583
|
}
|
3357
|
|
- rangeTimeStamp = rangeDate.Unix()
|
|
3584
|
+ startrangeTimeStamp = rangeDate.Unix()
|
|
3585
|
+ fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
|
3358
|
3586
|
} else {
|
3359
|
|
- rangeTimeStamp = 0
|
|
3587
|
+ startrangeTimeStamp = 0
|
3360
|
3588
|
}
|
3361
|
|
- now := time.Now().Unix()
|
3362
|
|
- userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
|
|
3589
|
+ if len(endtime) > 0 {
|
|
3590
|
+ rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
|
|
3591
|
+ fmt.Println("rangeData是什么",rangeDate)
|
|
3592
|
+ fmt.Println("parseDateErr",parseDateErr)
|
|
3593
|
+ if parseDateErr != nil {
|
|
3594
|
+ this.ErrorLog("日期(%v)解析错误:%v", endtime, parseDateErr)
|
|
3595
|
+ return
|
|
3596
|
+ }
|
|
3597
|
+ endrangeTimeStamp = rangeDate.Unix()
|
|
3598
|
+ fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
|
|
3599
|
+ } else {
|
|
3600
|
+ endrangeTimeStamp = 0
|
|
3601
|
+ }
|
|
3602
|
+ userorg, total, err := service.GetTodayExitlist(startrangeTimeStamp, endrangeTimeStamp, limit, page)
|
3363
|
3603
|
if err !=nil{
|
3364
|
3604
|
this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
|
3365
|
3605
|
return
|