11月8日库存管理

controllers/print_data_api_controller.go

@@ -43,10 +43,10 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Count = list.Count
 		}
 		if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
-			fmt.Println("dialysis_count322333223322323", dialysis_count)
-			item.Patient.TotalDialysis = dialysis_count
-			item.Count = dialysis_count
+			listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+			fmt.Println("lisntONE2323223323232", listOne.Count)
+			item.Patient.TotalDialysis = listOne.Count
+			item.Count = listOne.Count
 		}
 	}
 	if getScheduleErr != nil {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -216,10 +216,17 @@ func GetDialysisOrderCountSeven(patient_id int64, recordDate int64) (models.VmDi
 //	return
 //}
 
-func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
-	return
+//func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+//	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+//	return
+//}
+
+func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
 }
+
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error