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

controllers/mobile_api_controllers/dialysis_api_controller.go

 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood: blood,
+		Blood:                      blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood: blood,
+		Blood:                     blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	goodTypes, _ := service.FindAllGoodType(adminUser.Org.Id)
+	goodTypes, _ := service.FindAllGoodTypeOne(adminUser.Org.Id)
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
 
 	goodUser, _ := service.GetAllStockOutUserDetail(patient_id, adminUser.Org.Id, date.Unix())

service/stock_service.go

 }
 
 func FindAllGoodType(org_id int64) (goodType []*models.GoodsType, err error) {
+	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
+	return goodType, err
+}
+
+func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error) {
 	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1 and out_stock = 1", org_id).Find(&goodType).Error
 	return goodType, err
 }