Browse Source

提交代码

陈少旭 9 months ago
parent
commit
28d8b06c15
1 changed files with 18 additions and 3 deletions
  1. 18 3
      service/app_version.go

+ 18 - 3
service/app_version.go View File

@@ -447,6 +447,11 @@ func SaveOrder(order *models.HisOrder) {
447 447
 	writeDb.Save(&order)
448 448
 }
449 449
 
450
+func SaveOrderTwo(order *models.HisOrder) error {
451
+	err := writeDb.Save(&order).Error
452
+	return err
453
+}
454
+
450 455
 func GetAllPrivateHis(org_id int64) (his []*models.HisPatient) {
451 456
 	readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND balance_accounts_type = 2 AND status = 1", org_id).Find(&his)
452 457
 	return
@@ -599,7 +604,7 @@ func GetHisOrderDetailThree() (order []*HisOrderTen, err error) {
599 604
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
600 605
 			return db.Where("status = 1").Preload("Drug", "status = 1")
601 606
 		})
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
607
+	}).Where("setl_time >= '2024-01-01 00:00:00' AND setl_time <= '2024-01-31 23:59:00' AND status = 1 AND order_status =2  AND user_org_id = 10485").Find(&order).Order("patient_id").Error
603 608
 	return
604 609
 }
605 610
 
@@ -681,7 +686,7 @@ func (HisPrescriptionProjectTen) TableName() string {
681 686
 
682 687
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
683 688
 
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
689
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2024-04-01 00:00:00' AND in_hosptial_time <= '2024-05-31 23:59:59'", orgid).Find(&paitent).Error
685 690
 	return paitent, err
686 691
 }
687 692
 
@@ -897,7 +902,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
897 902
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
898 903
 			return db.Where("status = 1").Preload("VMHisProject")
899 904
 		})
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
905
+	}).Where("setl_time >= '2024-01-01 00:00:00' AND setl_time <= '2024-03-31 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10138").Find(&order).Error
901 906
 	return
902 907
 }
903 908
 
@@ -1387,3 +1392,13 @@ func GetHisPatient4444555() (paitent []*models.HisPatient, err error) {
1387 1392
 func UpDateNumber(id int64, number string) {
1388 1393
 	writeDb.Model(&models.GoodInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"number": number})
1389 1394
 }
1395
+
1396
+func GetOrderinfo(org_id int64) (info []models.HisOrderInfo, err error) {
1397
+	err = readDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and   advice_id = 0 and med_chrgitm_type = '09' and ctime >= 1717344000", org_id).Find(&info).Error
1398
+	for _, in := range info {
1399
+		var doc models.HisDoctorAdviceInfo
1400
+		readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and feedetl_sn = ? and status = 1 and advice_date = 1717344000", org_id, in.FeedetlSn).First(&doc)
1401
+		writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and feedetl_sn = ? and advice_id = 0 and med_chrgitm_type = '09' and ctime >= 1717344000", org_id, doc.FeedetlSn).Updates(map[string]interface{}{"advice_id": doc.ID})
1402
+	}
1403
+	return
1404
+}