11月8日库存管理

controllers/data_api_controller.go

@@ -512,11 +512,11 @@ func configChildFormData(dataconfig *models.Dataconfig, data []byte) (code int)
 			return
 		}
 		parent_id := int64(configBody["parent_id"].(float64))
-		if parent_id <= 0 {
-			utils.ErrorLog("parent_id <= 0")
-			code = enums.ErrorCodeParamWrong
-			return
-		}
+		//if parent_id <= 0 {
+		//	utils.ErrorLog("parent_id <= 0")
+		//	code = enums.ErrorCodeParamWrong
+		//	return
+		//}
 		dataconfig.ParentId = parent_id
 
 		if configBody["name"] == nil || reflect.TypeOf(configBody["name"]).String() != "string" {
@@ -525,11 +525,11 @@ func configChildFormData(dataconfig *models.Dataconfig, data []byte) (code int)
 			return
 		}
 		name, _ := configBody["name"].(string)
-		if len(name) == 0 {
-			utils.ErrorLog("len(name) == 0")
-			code = enums.ErrorCodeParamWrong
-			return
-		}
+		//if len(name) == 0 {
+		//	utils.ErrorLog("len(name) == 0")
+		//	code = enums.ErrorCodeParamWrong
+		//	return
+		//}
 		dataconfig.Name = name
 	}
 	return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 {
 		dewater_amount = dewater_amount * 1000
 	}
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -33,8 +33,8 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		return db.Where("user_org_id = ? AND status = 1", orgID).
 			Order("operate_time asc")
 	}).
-		Preload("DeviceNumber", "org_id = ? AND status = 1", orgID).
-		Preload("DeviceZone", "org_id = ? AND status = 1", orgID).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceZone", "org_id = ?", orgID).
 		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
 		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
 		Preload("Advices", func(db *gorm.DB) *gorm.DB {