Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

service/zuobiao_service.go

@@ -40,7 +40,7 @@ func GetUnUploadHisZuoBiaoPrescription(org_id int64, patient_id int64, record_da
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 AND order_status<> 4", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 AND order_status<> 4 AND order_status<> 5", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -56,7 +56,7 @@ func GetUploadHisZuoBiaoPrescription(org_id int64, patient_id int64, record_date
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND  order_status  <> 0 AND order_status <> 1 ", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND  order_status = 5 ", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -88,7 +88,7 @@ func GetMonthUploadHisZuoBiaoPrescription(org_id int64, patient_id int64, start_
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND patient_id = ? AND record_date <= ? AND  record_date >= ?  AND  order_status  <> 0 AND order_status <> 1", org_id, patient_id, end_time, start_time).
+		Where("user_org_id = ? AND status = 1 AND patient_id = ? AND record_date <= ? AND  record_date >= ?  AND  order_status  = 5", org_id, patient_id, end_time, start_time).
 		Find(&prescription).Error
 	return
 }