|
@@ -1073,8 +1073,8 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
|
1073
|
1073
|
return
|
1074
|
1074
|
}
|
1075
|
1075
|
|
1076
|
|
-func GetNewHisOrderListTwo(user_org_id int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisOrder, err error) {
|
1077
|
|
- db := readDb.Model(&models.HisOrder{})
|
|
1076
|
+func GetNewHisOrderListTwo(user_org_id int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisOrderELE, err error) {
|
|
1077
|
+ db := readDb.Model(&models.HisOrderELE{})
|
1078
|
1078
|
if start_time_timestamp != 0 {
|
1079
|
1079
|
db = db.Where("his_order.settle_accounts_date>=?", start_time_timestamp)
|
1080
|
1080
|
}
|
|
@@ -2141,6 +2141,7 @@ type NewTempPatients struct {
|
2141
|
2141
|
Status int64 `gorm:"column:status" json:"status" form:"status"`
|
2142
|
2142
|
IdCardNo string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
|
2143
|
2143
|
ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
|
|
2144
|
+ FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
|
2144
|
2145
|
|
2145
|
2146
|
Schedule Schedule `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
|
2146
|
2147
|
HisPatient []*HisPatient `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
|