|
@@ -1482,8 +1482,8 @@ func (c *HisApiController) GetSettleInfo() {
|
1482
|
1482
|
|
1483
|
1483
|
var prescriptions []*models.HisPrescription
|
1484
|
1484
|
|
1485
|
|
- var start_time int64
|
1486
|
|
- var end_time int64
|
|
1485
|
+ //var start_time int64
|
|
1486
|
+ //var end_time int64
|
1487
|
1487
|
|
1488
|
1488
|
data := make(map[string]interface{})
|
1489
|
1489
|
if settle_accounts_type == 1 { //日结
|
|
@@ -1501,14 +1501,14 @@ func (c *HisApiController) GetSettleInfo() {
|
1501
|
1501
|
return
|
1502
|
1502
|
}
|
1503
|
1503
|
recordStartTime := theStartTime.Unix()
|
1504
|
|
- start_time = recordStartTime
|
|
1504
|
+ //start_time = recordStartTime
|
1505
|
1505
|
theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
|
1506
|
1506
|
if err != nil {
|
1507
|
1507
|
c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
|
1508
|
1508
|
return
|
1509
|
1509
|
}
|
1510
|
1510
|
recordEndTime := theEndTime.Unix()
|
1511
|
|
- end_time = recordEndTime
|
|
1511
|
+ //end_time = recordEndTime
|
1512
|
1512
|
prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
|
1513
|
1513
|
data["pre"] = prescriptions
|
1514
|
1514
|
|