|
@@ -22,7 +22,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
22
|
22
|
}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
23
|
23
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
24
|
24
|
}).Where("status = 1 ")
|
25
|
|
- })
|
|
25
|
+ }).Where("status = 1")
|
26
|
26
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
27
|
27
|
}).Where("p.status = 1 AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
|
28
|
28
|
|
|
@@ -39,7 +39,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
39
|
39
|
}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
40
|
40
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
41
|
41
|
}).Where("status = 1 ")
|
42
|
|
- })
|
|
42
|
+ }).Where("status = 1")
|
43
|
43
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
44
|
44
|
}).Where("p.status = 1 AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
|
45
|
45
|
|
|
@@ -54,7 +54,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
54
|
54
|
return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
|
55
|
55
|
return db.Select("id,project_name,unit").Where("status = 1 ")
|
56
|
56
|
}).Where("status = 1 ")
|
57
|
|
- })
|
|
57
|
+ }).Where("status = 1")
|
58
|
58
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
59
|
59
|
}).Where("p.status = 1 AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
|
60
|
60
|
|
|
@@ -69,7 +69,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
69
|
69
|
return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
70
|
70
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
71
|
71
|
}).Where("status = 1 ")
|
72
|
|
- })
|
|
72
|
+ }).Where("status = 1")
|
73
|
73
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
74
|
74
|
}).Where("p.status = 1 AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
|
75
|
75
|
|
|
@@ -92,7 +92,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
92
|
92
|
}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
93
|
93
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
94
|
94
|
}).Where("status = 1 ")
|
95
|
|
- })
|
|
95
|
+ }).Where("status = 1")
|
96
|
96
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
97
|
97
|
}).Where("p.status = 1 AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
|
98
|
98
|
|
|
@@ -109,7 +109,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
109
|
109
|
}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
110
|
110
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
111
|
111
|
}).Where("status = 1 ")
|
112
|
|
- })
|
|
112
|
+ }).Where("status = 1")
|
113
|
113
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
114
|
114
|
}).Where("p.status = 1 AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
|
115
|
115
|
|
|
@@ -124,7 +124,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
124
|
124
|
return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
|
125
|
125
|
return db.Select("id,project_name,unit").Where("status = 1 ")
|
126
|
126
|
}).Where("status = 1 ")
|
127
|
|
- })
|
|
127
|
+ }).Where("status = 1")
|
128
|
128
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
129
|
129
|
}).Where("p.status = 1 AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
|
130
|
130
|
|
|
@@ -139,7 +139,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
|
139
|
139
|
return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
|
140
|
140
|
return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
|
141
|
141
|
}).Where("status = 1 ")
|
142
|
|
- })
|
|
142
|
+ }).Where("status = 1")
|
143
|
143
|
}).Where("status = 1 AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
|
144
|
144
|
}).Where("p.status = 1 AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
|
145
|
145
|
|