Browse Source

提交代码

陈少旭 1 year ago
parent
commit
fd6dfadc5a
1 changed files with 4 additions and 5 deletions
  1. 4 5
      service/app_version.go

+ 4 - 5
service/app_version.go View File

195
 	for _, item := range pe {
195
 	for _, item := range pe {
196
 		var sch models.Schedule
196
 		var sch models.Schedule
197
 		err := readDb.Model(&models.Schedule{}).Where("status = 1 AND schedule_date = ? AND patient_id = ? AND user_org_id = 9538", item.AssessmentDate, item.PatientId).First(&sch).Error
197
 		err := readDb.Model(&models.Schedule{}).Where("status = 1 AND schedule_date = ? AND patient_id = ? AND user_org_id = 9538", item.AssessmentDate, item.PatientId).First(&sch).Error
198
-
199
 		if err == nil {
198
 		if err == nil {
200
 			if sch.ID > 0 {
199
 			if sch.ID > 0 {
201
 				order := &models.DialysisOrder{
200
 				order := &models.DialysisOrder{
600
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
599
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
601
 			return db.Where("status = 1").Preload("Drug", "status = 1")
600
 			return db.Where("status = 1").Preload("Drug", "status = 1")
602
 		})
601
 		})
603
-	}).Where("setl_time >= '2023-01-01 00:00:00' AND setl_time <= '2023-03-31 23:59:59' AND status = 1 AND order_status =2  AND user_org_id = 10215").Find(&order).Order("patient_id").Error
602
+	}).Where("DATE_FORMAT(FROM_UNIXTIME(settle_accounts_date), '%Y-%m-%d %H:%i:%s') >= '2024-01-01 00:00:00' AND DATE_FORMAT(FROM_UNIXTIME(settle_accounts_date), '%Y-%m-%d %H:%i:%s') <= '2024-01-31 23:59:59' AND status = 1 AND order_status =2  AND user_org_id = 10485").Find(&order).Order("patient_id").Error
604
 	return
603
 	return
605
 }
604
 }
606
 
605
 
682
 
681
 
683
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
682
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
684
 
683
 
685
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2023-10-01 00:00:00' AND in_hosptial_time <= '2023-10-31 23:59:59'", orgid).Find(&paitent).Error
684
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2024-01-01 00:00:00' AND in_hosptial_time <= '2024-01-31 23:59:59'", orgid).Find(&paitent).Error
686
 	return paitent, err
685
 	return paitent, err
687
 }
686
 }
688
 
687
 
898
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
897
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
899
 			return db.Where("status = 1").Preload("VMHisProject")
898
 			return db.Where("status = 1").Preload("VMHisProject")
900
 		})
899
 		})
901
-	}).Where("setl_time >= '2022-01-01 00:00:00' AND setl_time <= '2022-12-31 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10215 and insutype = 310").Find(&order).Error
900
+	}).Where("setl_time >= '2023-10-01 00:00:00' AND setl_time <= '2023-12-31 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
902
 	return
901
 	return
903
 }
902
 }
904
 
903
 
1381
 
1380
 
1382
 func GetHisPatient4444555() (paitent []*models.HisPatient, err error) {
1381
 func GetHisPatient4444555() (paitent []*models.HisPatient, err error) {
1383
 
1382
 
1384
-	err = XTReadDB().Model(&paitent).Where("user_org_id = 10485  and status = 1 AND record_date >= 1696089600").Find(&paitent).Error
1383
+	err = XTReadDB().Model(&paitent).Where("user_org_id = 10485  and status = 1 AND record_date >= 1704038400").Find(&paitent).Error
1385
 	return paitent, err
1384
 	return paitent, err
1386
 }
1385
 }
1387
 
1386