|
|
@@ -72,7 +72,17 @@ func (HisHospitalOrder) TableName() string {
|
|
72
|
72
|
|
|
73
|
73
|
func GetHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
|
|
74
|
74
|
db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
|
|
75
|
|
- db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1 ", org_id)
|
|
|
75
|
+ db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1 AND record.record_date = ? ", org_id, record_date)
|
|
|
76
|
+ db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
|
|
|
77
|
+ return db.Where("user_org_id = ? AND status = 1 AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
|
|
|
78
|
+ })
|
|
|
79
|
+ err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
|
|
|
80
|
+ return
|
|
|
81
|
+}
|
|
|
82
|
+
|
|
|
83
|
+func GetHisHospitalSchPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
|
|
|
84
|
+ db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
|
|
|
85
|
+ db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? ", org_id, record_date)
|
|
76
|
86
|
db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
|
|
77
|
87
|
return db.Where("user_org_id = ? AND status = 1 AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
|
|
78
|
88
|
})
|
|
|
@@ -219,7 +229,7 @@ func (VMHisHospitalPrescriptionInfo) TableName() string {
|
|
219
|
229
|
|
|
220
|
230
|
func GetHisHospitalPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
|
|
221
|
231
|
offset := (page - 1) * limit
|
|
222
|
|
- db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1 ", org_id, record_date)
|
|
|
232
|
+ db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("his_prescription_info.user_org_id = ? AND his_prescription_info.status = 1 AND his_prescription_info.record_date = ? AND his_prescription_info.p_type = 1 ", org_id, record_date)
|
|
223
|
233
|
if len(keywords) > 0 {
|
|
224
|
234
|
keywords = "%" + keywords + "%"
|
|
225
|
235
|
db = db.Joins("JOIN xt_patients as p On his_prescription_info.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
|
|
|
@@ -269,10 +279,10 @@ func GetHospitalMonthHisPrescription(org_id int64, patient_id int64, start_time
|
|
269
|
279
|
return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
|
|
270
|
280
|
}).
|
|
271
|
281
|
Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
|
|
272
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
|
|
|
282
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
|
|
273
|
283
|
}).
|
|
274
|
284
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
|
275
|
|
- return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
|
|
|
285
|
+ return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
|
|
276
|
286
|
}).
|
|
277
|
287
|
Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
|
|
278
|
288
|
Find(&prescription).Error
|
csx