11月9日库存管理

controllers/print_data_api_controller.go

@@ -85,10 +85,20 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				item.Count = list.Count
 			}
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+				if item.ScheduleDate <= 1640966400 {
+					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
+
+				if item.ScheduleDate >= 1672502400 {
+					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = 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

@@ -57,7 +57,7 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		return nil, err
 	}
 	for _, item := range schedules {
-		if orgID != 10101 {
+		if orgID != 10101 && orgID != 10445 {
 			dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
 
 			item.Patient.TotalDialysis = dialysis_count
@@ -227,6 +227,12 @@ func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64)
 	return order, err
 }
 
+func GetDialysisOrderCountNight(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>=1672502400 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