11月8日库存管理

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -191,26 +191,23 @@ func (this *DialysisAPIController) Scheduals() {
 			//获取今日所有的处方开的耗材
 			project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
 
-			fmt.Println("orgID00000000000000000000000000000000", date.Unix())
 			//获取今日透析准备的数据
-			goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
+			//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
 
-			list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
+			//list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
 
-			autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
-			for _, item := range goodList {
-				for _, it := range list {
-					if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-						item.Children = append(item.Children, it)
-					}
-				}
-			}
-			fmt.Println("goodlist888888888888888888888", goodList, err)
+			//autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
+			//for _, item := range goodList {
+			//	for _, it := range list {
+			//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
+			//			item.Children = append(item.Children, it)
+			//		}
+			//	}
+			//}
+			//fmt.Println("goodlist888888888888888888888", goodList, err)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
 				"project":   project,
-				"goodList":  goodList,
-				"autoList":  autoList,
 			})
 		}
 
@@ -226,26 +223,26 @@ func (this *DialysisAPIController) Scheduals() {
 		project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
 
 		//获取今日透析准备的数据
-		goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
-		fmt.Println("goodlist23323232323233232332233223323233", goodList, err)
-
-		list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
-
-		for _, item := range goodList {
-			for _, it := range list {
-				if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-					item.Children = append(item.Children, it)
-				}
-			}
-		}
-		autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
+		//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
+		//fmt.Println("goodlist23323232323233232332233223323233", goodList, err)
+		//
+		//list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
+		//
+		//for _, item := range goodList {
+		//	for _, it := range list {
+		//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
+		//			item.Children = append(item.Children, it)
+		//		}
+		//	}
+		//}
+		//autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
 			"project":   project,
-			"goodList":  goodList,
-			"autoList":  autoList,
+			//"goodList":  goodList,
+			//"autoList":  autoList,
 		})
 
 	}
@@ -572,17 +569,17 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	//获取今日透析准备的数据
-	goodList, _ := service.MobileGetDialysisGoodsSeven(adminInfo.Org.Id, date.Unix())
-	list, _ := service.MobileGetDialysisGoodsSix(adminInfo.Org.Id, date.Unix())
-
-	autoList, _ := service.GetMobileAutoReduce(adminInfo.Org.Id, date.Unix())
-	for _, item := range goodList {
-		for _, it := range list {
-			if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-				item.Children = append(item.Children, it)
-			}
-		}
-	}
+	//goodList, _ := service.MobileGetDialysisGoodsSeven(adminInfo.Org.Id, date.Unix())
+	//list, _ := service.MobileGetDialysisGoodsSix(adminInfo.Org.Id, date.Unix())
+	//
+	//autoList, _ := service.GetMobileAutoReduce(adminInfo.Org.Id, date.Unix())
+	//for _, item := range goodList {
+	//	for _, it := range list {
+	//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
+	//			item.Children = append(item.Children, it)
+	//		}
+	//	}
+	//}
 
 	returnData := map[string]interface{}{
 		"patient":                        patient,
@@ -614,8 +611,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
 		"team_projects":                  team_projects,
-		"goodList":                       goodList,
-		"autoList":                       autoList,
+		//"goodList":                       goodList,
+		//"autoList":                       autoList,
 	}
 	this.ServeSuccessJSON(returnData)
 }

service/mobile_dialysis_service.go

@@ -3592,24 +3592,13 @@ func MobileGetPredialysisEvaluationSeven(orgID int64, patientID int64, recordDat
 	return &record, nil
 }
 
-func MobileGetDialysisGoodsSeven(orgID int64, scheduleDate int64) (prepare []*models.DialysisBeforePrepare, err error) {
-
-	db := readDb.Table("dialysis_before_prepare as p").Where("status = 1")
-	if orgID > 0 {
-		db = db.Where("p.user_org_id = ?", orgID)
-	}
-	if scheduleDate > 0 {
-		db = db.Where("p.record_date<= ?", scheduleDate)
-	}
-	err = db.Select("p.patient_id,p.good_id,Max(p.record_date) as record_date").Group("patient_id").Order("id desc").Find(&prepare).Error
-	return prepare, err
-}
-
-func MobileGetDialysisGoodsSix(orgID int64, scheduleDate int64) (prepare []*models.DialysisBeforePrepare, err error) {
+//
 
-	err = readDb.Where("user_org_id = ? AND status=1 AND record_date <= ? AND count > 0", orgID, scheduleDate).Select("patient_id,good_id,record_date").Find(&prepare).Error
-	return prepare, err
-}
+//func MobileGetDialysisGoodsSix(orgID int64, scheduleDate int64) (prepare []*models.DialysisBeforePrepare, err error) {
+//
+//	err = readDb.Where("user_org_id = ? AND status=1 AND record_date = ? AND count > 0", orgID, scheduleDate).Select("patient_id,good_id,record_date").Find(&prepare).Error
+//	return prepare, err
+//}
 
 func GetMobileAutoReduce(orgID int64, scheduleDate int64) (auto []*models.AutomaticReduceDetail, err error) {